aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscatterflower <marisaposs@gameboyprinter.moe>2020-08-16 21:48:50 -0500
committerscatterflower <marisaposs@gameboyprinter.moe>2020-08-16 21:48:50 -0500
commitc5f8fc8f96a58d6059781136c6ea37f332ea2ead (patch)
tree3378f228049c3f3fd08bd4e1af9d4e9b47d822a3
parent8712ed3ca14dfe571101dcc35c3b3a7206aaa1fc (diff)
make suggested changes from code review
-rw-r--r--src/courtroom.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 164537d1..a31bd0a7 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;