From 8712ed3ca14dfe571101dcc35c3b3a7206aaa1fc Mon Sep 17 00:00:00 2001 From: scatterflower Date: Sun, 16 Aug 2020 17:47:05 -0500 Subject: [PATCH 1/2] Don't hang IC due to invalid emote mod --- src/courtroom.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/courtroom.cpp b/src/courtroom.cpp index fa55ba8..164537d 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -2058,6 +2058,13 @@ void Courtroom::handle_chatmessage_2() set_scene(m_chatmessage[DESK_MOD], m_chatmessage[SIDE]); int emote_mod = m_chatmessage[EMOTE_MOD].toInt(); + // Deal with invalid emote modifiers + if(emote_mod < 0 || (emote_mod > 2 && emote_mod < 5) || emote_mod > 6){ + if(emote_mod == 4) + emote_mod = 6; // Addresses issue with an old bug that sent the wrong emote modifier for zoompre + else + emote_mod = 0; + } if (ao_app->flipping_enabled && m_chatmessage[FLIP].toInt() == 1) ui_vp_player_char->set_flipped(true); From c5f8fc8f96a58d6059781136c6ea37f332ea2ead Mon Sep 17 00:00:00 2001 From: scatterflower Date: Sun, 16 Aug 2020 21:48:50 -0500 Subject: [PATCH 2/2] make suggested changes from code review --- src/courtroom.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/courtroom.cpp b/src/courtroom.cpp index 164537d..a31bd0a 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -2059,8 +2059,9 @@ void Courtroom::handle_chatmessage_2() int emote_mod = m_chatmessage[EMOTE_MOD].toInt(); // Deal with invalid emote modifiers - if(emote_mod < 0 || (emote_mod > 2 && emote_mod < 5) || emote_mod > 6){ - if(emote_mod == 4) + if (emote_mod != 0 && emote_mod != 1 && emote_mod != 2 \ + && emote_mod != 5 && emote_mod != 6) { + if (emote_mod == 4) emote_mod = 6; // Addresses issue with an old bug that sent the wrong emote modifier for zoompre else emote_mod = 0;