Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed crashes and looping talking emotes

Browse Source
This commit is contained in:
David Skoland 2017-02-15 16:42:38 +01:00
parent b524819e5a
commit 0e1b50faaf
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aocharmovie.cpp
View File

@ -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) void AOCharMovie::play_talking(QString p_char, QString p_emote)
{ {
play_once = false;
play(p_char, p_emote, "(b)"); play(p_char, p_emote, "(b)");
} }
void AOCharMovie::play_idle(QString p_char, QString p_emote) void AOCharMovie::play_idle(QString p_char, QString p_emote)
{ {
play_once = false;
play(p_char, p_emote, "(a)"); play(p_char, p_emote, "(a)");
} }

4
courtroom.cpp
View File

@ -839,6 +839,8 @@ void Courtroom::append_server_chatmessage(QString f_message)
void Courtroom::on_chat_return_pressed() void Courtroom::on_chat_return_pressed()
{ {
qDebug() << "anim_state: " << anim_state;
if (ui_ic_chat_message->text() == "" || is_muted) if (ui_ic_chat_message->text() == "" || is_muted)
return; return;
@ -1233,8 +1235,8 @@ void Courtroom::chat_tick()
chat_tick_timer->stop(); chat_tick_timer->stop();
if (anim_state == 2) if (anim_state == 2)
{ {
ui_vp_player_char->play_idle(m_chatmessage[CHAR_NAME], m_chatmessage[EMOTE]);
anim_state = 3; anim_state = 3;
ui_vp_player_char->play_idle(m_chatmessage[CHAR_NAME], m_chatmessage[EMOTE]);
} }
} }