From 0e1b50faaf4c8b0e378c12e9d0f43de32351341d Mon Sep 17 00:00:00 2001 From: David Skoland Date: Wed, 15 Feb 2017 16:42:38 +0100 Subject: [PATCH] fixed crashes and looping talking emotes --- aocharmovie.cpp | 2 ++ courtroom.cpp | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/aocharmovie.cpp b/aocharmovie.cpp index fbaf636..5a455c7 100644 --- a/aocharmovie.cpp +++ b/aocharmovie.cpp @@ -76,11 +76,13 @@ void AOCharMovie::play_pre(QString p_char, QString p_emote, int duration) void AOCharMovie::play_talking(QString p_char, QString p_emote) { + play_once = false; play(p_char, p_emote, "(b)"); } void AOCharMovie::play_idle(QString p_char, QString p_emote) { + play_once = false; play(p_char, p_emote, "(a)"); } diff --git a/courtroom.cpp b/courtroom.cpp index 52bac1d..ca20185 100644 --- a/courtroom.cpp +++ b/courtroom.cpp @@ -839,6 +839,8 @@ void Courtroom::append_server_chatmessage(QString f_message) void Courtroom::on_chat_return_pressed() { + qDebug() << "anim_state: " << anim_state; + if (ui_ic_chat_message->text() == "" || is_muted) return; @@ -1233,8 +1235,8 @@ void Courtroom::chat_tick() chat_tick_timer->stop(); if (anim_state == 2) { - ui_vp_player_char->play_idle(m_chatmessage[CHAR_NAME], m_chatmessage[EMOTE]); anim_state = 3; + ui_vp_player_char->play_idle(m_chatmessage[CHAR_NAME], m_chatmessage[EMOTE]); } }