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

Make screenshakes work with preanim delays

Browse Source
This commit is contained in:
Crystalwarrior 2019-10-01 01:38:38 +03:00
parent 4f738bfe34
commit 0eccf1ba22
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/courtroom.cpp
View File

@ -2457,7 +2457,8 @@ void Courtroom::start_chat_ticking()
sfx_player->play(ao_app->get_custom_realization(m_chatmessage[CHAR_NAME])); sfx_player->play(ao_app->get_custom_realization(m_chatmessage[CHAR_NAME]));
} }
if (m_chatmessage[SCREENSHAKE] == "1") int emote_mod = m_chatmessage[EMOTE_MOD].toInt(); //text meme bonanza
if ((emote_mod == 0 || emote_mod == 5) && m_chatmessage[SCREENSHAKE] == "1")
{ {
this->do_screenshake(); this->do_screenshake();
} }
@ -2682,7 +2683,10 @@ void Courtroom::chat_tick()
void Courtroom::play_sfx() void Courtroom::play_sfx()
{ {
QString sfx_name = m_chatmessage[SFX_NAME]; QString sfx_name = m_chatmessage[SFX_NAME];
if (m_chatmessage[SCREENSHAKE] == "1") //Screenshake dependant on preanim sfx delay meme
{
this->do_screenshake();
}
if (sfx_name == "1") if (sfx_name == "1")
return; return;