From 2e26714397b75198960c88ba118ab6918e6d57a9 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Sat, 9 May 2026 01:51:35 +0200 Subject: [PATCH 1/6] Moved messages. --- .../Source/Common/MessageStream.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp index 0addbe79dac..bf49ee37d41 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp @@ -378,6 +378,11 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) CASE_LABEL(MSG_META_END_CAMERA_ZOOM_OUT) CASE_LABEL(MSG_META_CAMERA_RESET) CASE_LABEL(MSG_META_TOGGLE_CAMERA_TRACKING_DRAWABLE) + CASE_LABEL(MSG_META_TOGGLE_FAST_FORWARD_REPLAY) + CASE_LABEL(MSG_META_TOGGLE_PAUSE) + CASE_LABEL(MSG_META_TOGGLE_PAUSE_ALT) + CASE_LABEL(MSG_META_STEP_FRAME) + CASE_LABEL(MSG_META_STEP_FRAME_ALT) CASE_LABEL(MSG_META_DEMO_INSTANT_QUIT) #if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)//may be defined in GameCommon.h @@ -403,12 +408,6 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) CASE_LABEL(MSG_CHEAT_TOGGLE_MESSAGE_TEXT) #endif - CASE_LABEL(MSG_META_TOGGLE_FAST_FORWARD_REPLAY) - CASE_LABEL(MSG_META_TOGGLE_PAUSE) - CASE_LABEL(MSG_META_TOGGLE_PAUSE_ALT) - CASE_LABEL(MSG_META_STEP_FRAME) - CASE_LABEL(MSG_META_STEP_FRAME_ALT) - #if defined(RTS_DEBUG) CASE_LABEL(MSG_META_DEMO_TOGGLE_BEHIND_BUILDINGS) CASE_LABEL(MSG_META_DEMO_TOGGLE_LETTERBOX) @@ -546,7 +545,6 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) CASE_LABEL(MSG_BEGIN_AREA_SELECTION_HINT) CASE_LABEL(MSG_END_AREA_SELECTION_HINT) CASE_LABEL(MSG_DO_ATTACK_OBJECT_HINT) - CASE_LABEL(MSG_DO_ATTACK_OBJECT_AFTER_MOVING_HINT) CASE_LABEL(MSG_DO_FORCE_ATTACK_OBJECT_HINT) CASE_LABEL(MSG_DO_FORCE_ATTACK_GROUND_HINT) CASE_LABEL(MSG_GET_REPAIRED_HINT) @@ -563,7 +561,6 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) CASE_LABEL(MSG_FIREBOMB_HINT) CASE_LABEL(MSG_CONVERT_TO_CARBOMB_HINT) CASE_LABEL(MSG_CAPTUREBUILDING_HINT) - CASE_LABEL(MSG_HACK_HINT) #ifdef ALLOW_SURRENDER CASE_LABEL(MSG_PICK_UP_PRISONER_HINT) @@ -574,6 +571,8 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) CASE_LABEL(MSG_SET_RALLY_POINT_HINT) CASE_LABEL(MSG_DO_SALVAGE_HINT) CASE_LABEL(MSG_DO_INVALID_HINT) + CASE_LABEL(MSG_DO_ATTACK_OBJECT_AFTER_MOVING_HINT) + CASE_LABEL(MSG_HACK_HINT) CASE_LABEL(MSG_BEGIN_NETWORK_MESSAGES) CASE_LABEL(MSG_CREATE_SELECTED_GROUP) CASE_LABEL(MSG_CREATE_SELECTED_GROUP_NO_SOUND) @@ -684,6 +683,8 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) CASE_LABEL(MSG_SELF_DESTRUCT) CASE_LABEL(MSG_CREATE_FORMATION) CASE_LABEL(MSG_LOGIC_CRC) + CASE_LABEL(MSG_SET_MINE_CLEARING_DETAIL) + CASE_LABEL(MSG_ENABLE_RETALIATION_MODE) #if defined(RTS_DEBUG) CASE_LABEL(MSG_DEBUG_KILL_SELECTION) @@ -698,8 +699,6 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) CASE_LABEL(MSG_OBJECT_POSITION) CASE_LABEL(MSG_OBJECT_ORIENTATION) CASE_LABEL(MSG_OBJECT_JOINED_TEAM) - CASE_LABEL(MSG_SET_MINE_CLEARING_DETAIL) - CASE_LABEL(MSG_ENABLE_RETALIATION_MODE) } #undef CASE_LABEL From 4e753ee6da7b84732f0e26920fe87d308f59439d Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Sat, 9 May 2026 01:54:51 +0200 Subject: [PATCH 2/6] Added missing cases. --- GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp index bf49ee37d41..6721fa94357 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp @@ -545,6 +545,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) CASE_LABEL(MSG_BEGIN_AREA_SELECTION_HINT) CASE_LABEL(MSG_END_AREA_SELECTION_HINT) CASE_LABEL(MSG_DO_ATTACK_OBJECT_HINT) + CASE_LABEL(MSG_IMPOSSIBLE_ATTACK_HINT) CASE_LABEL(MSG_DO_FORCE_ATTACK_OBJECT_HINT) CASE_LABEL(MSG_DO_FORCE_ATTACK_GROUND_HINT) CASE_LABEL(MSG_GET_REPAIRED_HINT) @@ -569,6 +570,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) CASE_LABEL(MSG_SNIPE_VEHICLE_HINT) CASE_LABEL(MSG_DEFECTOR_HINT) CASE_LABEL(MSG_SET_RALLY_POINT_HINT) + CASE_LABEL(MSG_DO_SPECIAL_POWER_OVERRIDE_DESTINATION_HINT) CASE_LABEL(MSG_DO_SALVAGE_HINT) CASE_LABEL(MSG_DO_INVALID_HINT) CASE_LABEL(MSG_DO_ATTACK_OBJECT_AFTER_MOVING_HINT) @@ -669,6 +671,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) CASE_LABEL(MSG_STEALCASH_HACK) CASE_LABEL(MSG_DISABLEBUILDING_HACK) CASE_LABEL(MSG_SNIPE_VEHICLE) + CASE_LABEL(MSG_DO_SPECIAL_POWER_OVERRIDE_DESTINATION) #ifdef ALLOW_SURRENDER CASE_LABEL(MSG_PICK_UP_PRISONER) @@ -685,6 +688,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) CASE_LABEL(MSG_LOGIC_CRC) CASE_LABEL(MSG_SET_MINE_CLEARING_DETAIL) CASE_LABEL(MSG_ENABLE_RETALIATION_MODE) + CASE_LABEL(MSG_BEGIN_DEBUG_NETWORK_MESSAGES) #if defined(RTS_DEBUG) CASE_LABEL(MSG_DEBUG_KILL_SELECTION) From 86dc14e4cf5f0c28fdde9b179351684a9c642807 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Sat, 9 May 2026 01:55:39 +0200 Subject: [PATCH 3/6] Changed ifdefs. --- .../Code/GameEngine/Source/Common/MessageStream.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp index 6721fa94357..62de9217e9d 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp @@ -385,7 +385,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) CASE_LABEL(MSG_META_STEP_FRAME_ALT) CASE_LABEL(MSG_META_DEMO_INSTANT_QUIT) -#if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)//may be defined in GameCommon.h +#if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) CASE_LABEL(MSG_CHEAT_RUNSCRIPT1) CASE_LABEL(MSG_CHEAT_RUNSCRIPT2) CASE_LABEL(MSG_CHEAT_RUNSCRIPT3) @@ -529,11 +529,11 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) #if defined(RTS_DEBUG) CASE_LABEL(MSG_META_DEMO_TOGGLE_AUDIODEBUG) -#endif//defined(RTS_DEBUG) +#endif // defined(RTS_DEBUG) #ifdef DUMP_PERF_STATS CASE_LABEL(MSG_META_DEMO_PERFORM_STATISTICAL_DUMP) -#endif//DUMP_PERF_STATS +#endif // DUMP_PERF_STATS CASE_LABEL(MSG_META_PLACE_BEACON) CASE_LABEL(MSG_META_REMOVE_BEACON) @@ -690,7 +690,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) CASE_LABEL(MSG_ENABLE_RETALIATION_MODE) CASE_LABEL(MSG_BEGIN_DEBUG_NETWORK_MESSAGES) -#if defined(RTS_DEBUG) +#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE) CASE_LABEL(MSG_DEBUG_KILL_SELECTION) CASE_LABEL(MSG_DEBUG_HURT_OBJECT) CASE_LABEL(MSG_DEBUG_KILL_OBJECT) From e398eacfcd4cdede29d04996a46c46ea08e8a938 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Sat, 9 May 2026 01:58:35 +0200 Subject: [PATCH 4/6] Moved non-existing message cases. --- .../Source/Common/MessageStream.cpp | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp index 62de9217e9d..278d71c44dc 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp @@ -653,17 +653,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) CASE_LABEL(MSG_DO_SCATTER) CASE_LABEL(MSG_INTERNET_HACK) CASE_LABEL(MSG_DO_CHEER) - -#ifdef ALLOW_SURRENDER - CASE_LABEL(MSG_DO_SURRENDER) -#endif - CASE_LABEL(MSG_TOGGLE_OVERCHARGE) - -#ifdef ALLOW_SURRENDER - CASE_LABEL(MSG_RETURN_TO_PRISON) -#endif - CASE_LABEL(MSG_SWITCH_WEAPONS) CASE_LABEL(MSG_CONVERT_TO_CARBOMB) CASE_LABEL(MSG_CAPTUREBUILDING) @@ -672,11 +662,6 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) CASE_LABEL(MSG_DISABLEBUILDING_HACK) CASE_LABEL(MSG_SNIPE_VEHICLE) CASE_LABEL(MSG_DO_SPECIAL_POWER_OVERRIDE_DESTINATION) - -#ifdef ALLOW_SURRENDER - CASE_LABEL(MSG_PICK_UP_PRISONER) -#endif - CASE_LABEL(MSG_DO_SALVAGE) CASE_LABEL(MSG_CLEAR_INGAME_POPUP_MESSAGE) CASE_LABEL(MSG_PLACE_BEACON) @@ -703,6 +688,12 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) CASE_LABEL(MSG_OBJECT_POSITION) CASE_LABEL(MSG_OBJECT_ORIENTATION) CASE_LABEL(MSG_OBJECT_JOINED_TEAM) + +#ifdef ALLOW_SURRENDER + CASE_LABEL(MSG_DO_SURRENDER) + CASE_LABEL(MSG_RETURN_TO_PRISON) + CASE_LABEL(MSG_PICK_UP_PRISONER) +#endif } #undef CASE_LABEL From 90415155356865b454f5feb9b54efbd351f87593 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Sun, 10 May 2026 16:36:30 +0200 Subject: [PATCH 5/6] Removed endif comments for short sections. --- GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp index 278d71c44dc..44d8ef27c80 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp @@ -529,11 +529,11 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) #if defined(RTS_DEBUG) CASE_LABEL(MSG_META_DEMO_TOGGLE_AUDIODEBUG) -#endif // defined(RTS_DEBUG) +#endif #ifdef DUMP_PERF_STATS CASE_LABEL(MSG_META_DEMO_PERFORM_STATISTICAL_DUMP) -#endif // DUMP_PERF_STATS +#endif CASE_LABEL(MSG_META_PLACE_BEACON) CASE_LABEL(MSG_META_REMOVE_BEACON) From 0852539be7bf5dfa65278e7b0bf70619e54b85c8 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Wed, 13 May 2026 16:36:00 +0200 Subject: [PATCH 6/6] Replicated in Generals (manually). --- .../Source/Common/MessageStream.cpp | 35 ++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/Generals/Code/GameEngine/Source/Common/MessageStream.cpp b/Generals/Code/GameEngine/Source/Common/MessageStream.cpp index b970e457bf0..2d595957cae 100644 --- a/Generals/Code/GameEngine/Source/Common/MessageStream.cpp +++ b/Generals/Code/GameEngine/Source/Common/MessageStream.cpp @@ -500,11 +500,11 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) #if defined(RTS_DEBUG) CASE_LABEL(MSG_META_DEMO_TOGGLE_AUDIODEBUG) -#endif//defined(RTS_DEBUG) +#endif #ifdef DUMP_PERF_STATS CASE_LABEL(MSG_META_DEMO_PERFORM_STATISTICAL_DUMP) -#endif//DUMP_PERF_STATS +#endif CASE_LABEL(MSG_META_PLACE_BEACON) CASE_LABEL(MSG_META_REMOVE_BEACON) @@ -516,7 +516,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) CASE_LABEL(MSG_BEGIN_AREA_SELECTION_HINT) CASE_LABEL(MSG_END_AREA_SELECTION_HINT) CASE_LABEL(MSG_DO_ATTACK_OBJECT_HINT) - CASE_LABEL(MSG_DO_ATTACK_OBJECT_AFTER_MOVING_HINT) + CASE_LABEL(MSG_IMPOSSIBLE_ATTACK_HINT) CASE_LABEL(MSG_DO_FORCE_ATTACK_OBJECT_HINT) CASE_LABEL(MSG_DO_FORCE_ATTACK_GROUND_HINT) CASE_LABEL(MSG_GET_REPAIRED_HINT) @@ -532,7 +532,6 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) CASE_LABEL(MSG_FIREBOMB_HINT) CASE_LABEL(MSG_CONVERT_TO_CARBOMB_HINT) CASE_LABEL(MSG_CAPTUREBUILDING_HINT) - CASE_LABEL(MSG_HACK_HINT) #ifdef ALLOW_SURRENDER CASE_LABEL(MSG_PICK_UP_PRISONER_HINT) @@ -541,8 +540,11 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) CASE_LABEL(MSG_SNIPE_VEHICLE_HINT) CASE_LABEL(MSG_DEFECTOR_HINT) CASE_LABEL(MSG_SET_RALLY_POINT_HINT) + CASE_LABEL(MSG_DO_SPECIAL_POWER_OVERRIDE_DESTINATION_HINT) CASE_LABEL(MSG_DO_SALVAGE_HINT) CASE_LABEL(MSG_DO_INVALID_HINT) + CASE_LABEL(MSG_DO_ATTACK_OBJECT_AFTER_MOVING_HINT) + CASE_LABEL(MSG_HACK_HINT) CASE_LABEL(MSG_BEGIN_NETWORK_MESSAGES) CASE_LABEL(MSG_CREATE_SELECTED_GROUP) CASE_LABEL(MSG_CREATE_SELECTED_GROUP_NO_SOUND) @@ -621,17 +623,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) CASE_LABEL(MSG_DO_SCATTER) CASE_LABEL(MSG_INTERNET_HACK) CASE_LABEL(MSG_DO_CHEER) - -#ifdef ALLOW_SURRENDER - CASE_LABEL(MSG_DO_SURRENDER) -#endif - CASE_LABEL(MSG_TOGGLE_OVERCHARGE) - -#ifdef ALLOW_SURRENDER - CASE_LABEL(MSG_RETURN_TO_PRISON) -#endif - CASE_LABEL(MSG_SWITCH_WEAPONS) CASE_LABEL(MSG_CONVERT_TO_CARBOMB) CASE_LABEL(MSG_CAPTUREBUILDING) @@ -639,11 +631,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) CASE_LABEL(MSG_STEALCASH_HACK) CASE_LABEL(MSG_DISABLEBUILDING_HACK) CASE_LABEL(MSG_SNIPE_VEHICLE) - -#ifdef ALLOW_SURRENDER - CASE_LABEL(MSG_PICK_UP_PRISONER) -#endif - + CASE_LABEL(MSG_DO_SPECIAL_POWER_OVERRIDE_DESTINATION) CASE_LABEL(MSG_DO_SALVAGE) CASE_LABEL(MSG_CLEAR_INGAME_POPUP_MESSAGE) CASE_LABEL(MSG_PLACE_BEACON) @@ -653,6 +641,8 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) CASE_LABEL(MSG_SELF_DESTRUCT) CASE_LABEL(MSG_CREATE_FORMATION) CASE_LABEL(MSG_LOGIC_CRC) + CASE_LABEL(MSG_SET_MINE_CLEARING_DETAIL) + CASE_LABEL(MSG_BEGIN_DEBUG_NETWORK_MESSAGES) #if defined(RTS_DEBUG) CASE_LABEL(MSG_DEBUG_KILL_SELECTION) @@ -667,7 +657,12 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) CASE_LABEL(MSG_OBJECT_POSITION) CASE_LABEL(MSG_OBJECT_ORIENTATION) CASE_LABEL(MSG_OBJECT_JOINED_TEAM) - CASE_LABEL(MSG_SET_MINE_CLEARING_DETAIL) + +#ifdef ALLOW_SURRENDER + CASE_LABEL(MSG_DO_SURRENDER) + CASE_LABEL(MSG_RETURN_TO_PRISON) + CASE_LABEL(MSG_PICK_UP_PRISONER) +#endif } #undef CASE_LABEL