From c3fd82eaccf009fc683ddebad57b9938e29c607a Mon Sep 17 00:00:00 2001 From: Crystalwarrior Date: Thu, 24 Mar 2022 03:05:27 +0300 Subject: Fix SFX dropdown regressions, make dropdown play sound if custom sound is listed regardless of Pre (#656) * Fix SFX dropdown not playing a sound despite a sound being selected. It was waiting on a preanim box to be checked, but that behavior was not intuitive. Plus this is a regression from intended behavior * Make "default" sfx behavior behave as expected * Tidy up the network logic for emote_mod and comment all of its behavior Fix sfx not playing when immeidate is checked on * make emote_mod an enum so I don't have to go scouring documentation to learn what it does anymore not adding emote mod for enums 2, 3 and 4 cuz those are planned to be deprecated in a later PR Make Clang happy with no bracket-less if statements --- include/datatypes.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'include') diff --git a/include/datatypes.h b/include/datatypes.h index ebf2e38..2f03d39 100644 --- a/include/datatypes.h +++ b/include/datatypes.h @@ -101,6 +101,13 @@ enum CHAT_MESSAGE { EFFECTS }; +enum EMOTE_MOD { + IDLE = 0, + PREANIM = 1, + ZOOM = 5, + PREANIM_ZOOM = 6, +}; + enum MUSIC_EFFECT { FADE_IN = 1, FADE_OUT = 2, SYNC_POS = 4 }; #endif // DATATYPES_H -- cgit