From fd6f3f5f11b339259016367dc3f85f3ed20d9e3d Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Thu, 10 Jul 2025 23:39:04 +0200 Subject: [PATCH 1/9] Renamed macro, no other change. --- .../Source/Common/MessageStream.cpp | 824 +++++++++--------- 1 file changed, 412 insertions(+), 412 deletions(-) diff --git a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp index 81eeb47fab..519e132bb6 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp @@ -230,453 +230,453 @@ AsciiString GameMessage::getCommandAsAsciiString( void ) AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) { -#define CHECK_IF(x) if (t == x) { return #x; } +#define CASE_LABEL(x) if (t == x) { return #x; } AsciiString commandName = "UnknownMessage"; if (t >= GameMessage::MSG_COUNT) { commandName = "Invalid command"; } - CHECK_IF(MSG_INVALID) - CHECK_IF(MSG_FRAME_TICK) - CHECK_IF(MSG_RAW_MOUSE_BEGIN) - CHECK_IF(MSG_RAW_MOUSE_POSITION) - CHECK_IF(MSG_RAW_MOUSE_LEFT_BUTTON_DOWN) - CHECK_IF(MSG_RAW_MOUSE_LEFT_DOUBLE_CLICK) - CHECK_IF(MSG_RAW_MOUSE_LEFT_BUTTON_UP) - CHECK_IF(MSG_RAW_MOUSE_LEFT_CLICK) - CHECK_IF(MSG_RAW_MOUSE_LEFT_DRAG) - CHECK_IF(MSG_RAW_MOUSE_MIDDLE_BUTTON_DOWN) - CHECK_IF(MSG_RAW_MOUSE_MIDDLE_DOUBLE_CLICK) - CHECK_IF(MSG_RAW_MOUSE_MIDDLE_BUTTON_UP) - CHECK_IF(MSG_RAW_MOUSE_MIDDLE_DRAG) - CHECK_IF(MSG_RAW_MOUSE_RIGHT_BUTTON_DOWN) - CHECK_IF(MSG_RAW_MOUSE_RIGHT_DOUBLE_CLICK) - CHECK_IF(MSG_RAW_MOUSE_RIGHT_BUTTON_UP) - CHECK_IF(MSG_RAW_MOUSE_RIGHT_DRAG) - CHECK_IF(MSG_RAW_MOUSE_WHEEL) - CHECK_IF(MSG_RAW_MOUSE_END) - CHECK_IF(MSG_RAW_KEY_DOWN) - CHECK_IF(MSG_RAW_KEY_UP) - CHECK_IF(MSG_MOUSE_LEFT_CLICK) - CHECK_IF(MSG_MOUSE_LEFT_DOUBLE_CLICK) - CHECK_IF(MSG_MOUSE_MIDDLE_CLICK) - CHECK_IF(MSG_MOUSE_MIDDLE_DOUBLE_CLICK) - CHECK_IF(MSG_MOUSE_RIGHT_CLICK) - CHECK_IF(MSG_MOUSE_RIGHT_DOUBLE_CLICK) - CHECK_IF(MSG_CLEAR_GAME_DATA) - CHECK_IF(MSG_NEW_GAME) - CHECK_IF(MSG_BEGIN_META_MESSAGES) - CHECK_IF(MSG_META_SAVE_VIEW1) - CHECK_IF(MSG_META_SAVE_VIEW2) - CHECK_IF(MSG_META_SAVE_VIEW3) - CHECK_IF(MSG_META_SAVE_VIEW4) - CHECK_IF(MSG_META_SAVE_VIEW5) - CHECK_IF(MSG_META_SAVE_VIEW6) - CHECK_IF(MSG_META_SAVE_VIEW7) - CHECK_IF(MSG_META_SAVE_VIEW8) - CHECK_IF(MSG_META_VIEW_VIEW1) - CHECK_IF(MSG_META_VIEW_VIEW2) - CHECK_IF(MSG_META_VIEW_VIEW3) - CHECK_IF(MSG_META_VIEW_VIEW4) - CHECK_IF(MSG_META_VIEW_VIEW5) - CHECK_IF(MSG_META_VIEW_VIEW6) - CHECK_IF(MSG_META_VIEW_VIEW7) - CHECK_IF(MSG_META_VIEW_VIEW8) - CHECK_IF(MSG_META_CREATE_TEAM0) - CHECK_IF(MSG_META_CREATE_TEAM1) - CHECK_IF(MSG_META_CREATE_TEAM2) - CHECK_IF(MSG_META_CREATE_TEAM3) - CHECK_IF(MSG_META_CREATE_TEAM4) - CHECK_IF(MSG_META_CREATE_TEAM5) - CHECK_IF(MSG_META_CREATE_TEAM6) - CHECK_IF(MSG_META_CREATE_TEAM7) - CHECK_IF(MSG_META_CREATE_TEAM8) - CHECK_IF(MSG_META_CREATE_TEAM9) - CHECK_IF(MSG_META_SELECT_TEAM0) - CHECK_IF(MSG_META_SELECT_TEAM1) - CHECK_IF(MSG_META_SELECT_TEAM2) - CHECK_IF(MSG_META_SELECT_TEAM3) - CHECK_IF(MSG_META_SELECT_TEAM4) - CHECK_IF(MSG_META_SELECT_TEAM5) - CHECK_IF(MSG_META_SELECT_TEAM6) - CHECK_IF(MSG_META_SELECT_TEAM7) - CHECK_IF(MSG_META_SELECT_TEAM8) - CHECK_IF(MSG_META_SELECT_TEAM9) - CHECK_IF(MSG_META_ADD_TEAM0) - CHECK_IF(MSG_META_ADD_TEAM1) - CHECK_IF(MSG_META_ADD_TEAM2) - CHECK_IF(MSG_META_ADD_TEAM3) - CHECK_IF(MSG_META_ADD_TEAM4) - CHECK_IF(MSG_META_ADD_TEAM5) - CHECK_IF(MSG_META_ADD_TEAM6) - CHECK_IF(MSG_META_ADD_TEAM7) - CHECK_IF(MSG_META_ADD_TEAM8) - CHECK_IF(MSG_META_ADD_TEAM9) - CHECK_IF(MSG_META_VIEW_TEAM0) - CHECK_IF(MSG_META_VIEW_TEAM1) - CHECK_IF(MSG_META_VIEW_TEAM2) - CHECK_IF(MSG_META_VIEW_TEAM3) - CHECK_IF(MSG_META_VIEW_TEAM4) - CHECK_IF(MSG_META_VIEW_TEAM5) - CHECK_IF(MSG_META_VIEW_TEAM6) - CHECK_IF(MSG_META_VIEW_TEAM7) - CHECK_IF(MSG_META_VIEW_TEAM8) - CHECK_IF(MSG_META_VIEW_TEAM9) - CHECK_IF(MSG_META_SELECT_MATCHING_UNITS) - CHECK_IF(MSG_META_SELECT_NEXT_UNIT) - CHECK_IF(MSG_META_SELECT_PREV_UNIT) - CHECK_IF(MSG_META_SELECT_NEXT_WORKER) - CHECK_IF(MSG_META_SELECT_PREV_WORKER) - CHECK_IF(MSG_META_VIEW_COMMAND_CENTER) - CHECK_IF(MSG_META_VIEW_LAST_RADAR_EVENT) - CHECK_IF(MSG_META_SELECT_HERO) - CHECK_IF(MSG_META_SELECT_ALL) - CHECK_IF(MSG_META_SELECT_ALL_AIRCRAFT) - CHECK_IF(MSG_META_SCATTER) - CHECK_IF(MSG_META_STOP) - CHECK_IF(MSG_META_DEPLOY) - CHECK_IF(MSG_META_CREATE_FORMATION) - CHECK_IF(MSG_META_FOLLOW) - CHECK_IF(MSG_META_CHAT_PLAYERS) - CHECK_IF(MSG_META_CHAT_ALLIES) - CHECK_IF(MSG_META_CHAT_EVERYONE) - CHECK_IF(MSG_META_DIPLOMACY) - CHECK_IF(MSG_META_OPTIONS) + CASE_LABEL(MSG_INVALID) + CASE_LABEL(MSG_FRAME_TICK) + CASE_LABEL(MSG_RAW_MOUSE_BEGIN) + CASE_LABEL(MSG_RAW_MOUSE_POSITION) + CASE_LABEL(MSG_RAW_MOUSE_LEFT_BUTTON_DOWN) + CASE_LABEL(MSG_RAW_MOUSE_LEFT_DOUBLE_CLICK) + CASE_LABEL(MSG_RAW_MOUSE_LEFT_BUTTON_UP) + CASE_LABEL(MSG_RAW_MOUSE_LEFT_CLICK) + CASE_LABEL(MSG_RAW_MOUSE_LEFT_DRAG) + CASE_LABEL(MSG_RAW_MOUSE_MIDDLE_BUTTON_DOWN) + CASE_LABEL(MSG_RAW_MOUSE_MIDDLE_DOUBLE_CLICK) + CASE_LABEL(MSG_RAW_MOUSE_MIDDLE_BUTTON_UP) + CASE_LABEL(MSG_RAW_MOUSE_MIDDLE_DRAG) + CASE_LABEL(MSG_RAW_MOUSE_RIGHT_BUTTON_DOWN) + CASE_LABEL(MSG_RAW_MOUSE_RIGHT_DOUBLE_CLICK) + CASE_LABEL(MSG_RAW_MOUSE_RIGHT_BUTTON_UP) + CASE_LABEL(MSG_RAW_MOUSE_RIGHT_DRAG) + CASE_LABEL(MSG_RAW_MOUSE_WHEEL) + CASE_LABEL(MSG_RAW_MOUSE_END) + CASE_LABEL(MSG_RAW_KEY_DOWN) + CASE_LABEL(MSG_RAW_KEY_UP) + CASE_LABEL(MSG_MOUSE_LEFT_CLICK) + CASE_LABEL(MSG_MOUSE_LEFT_DOUBLE_CLICK) + CASE_LABEL(MSG_MOUSE_MIDDLE_CLICK) + CASE_LABEL(MSG_MOUSE_MIDDLE_DOUBLE_CLICK) + CASE_LABEL(MSG_MOUSE_RIGHT_CLICK) + CASE_LABEL(MSG_MOUSE_RIGHT_DOUBLE_CLICK) + CASE_LABEL(MSG_CLEAR_GAME_DATA) + CASE_LABEL(MSG_NEW_GAME) + CASE_LABEL(MSG_BEGIN_META_MESSAGES) + CASE_LABEL(MSG_META_SAVE_VIEW1) + CASE_LABEL(MSG_META_SAVE_VIEW2) + CASE_LABEL(MSG_META_SAVE_VIEW3) + CASE_LABEL(MSG_META_SAVE_VIEW4) + CASE_LABEL(MSG_META_SAVE_VIEW5) + CASE_LABEL(MSG_META_SAVE_VIEW6) + CASE_LABEL(MSG_META_SAVE_VIEW7) + CASE_LABEL(MSG_META_SAVE_VIEW8) + CASE_LABEL(MSG_META_VIEW_VIEW1) + CASE_LABEL(MSG_META_VIEW_VIEW2) + CASE_LABEL(MSG_META_VIEW_VIEW3) + CASE_LABEL(MSG_META_VIEW_VIEW4) + CASE_LABEL(MSG_META_VIEW_VIEW5) + CASE_LABEL(MSG_META_VIEW_VIEW6) + CASE_LABEL(MSG_META_VIEW_VIEW7) + CASE_LABEL(MSG_META_VIEW_VIEW8) + CASE_LABEL(MSG_META_CREATE_TEAM0) + CASE_LABEL(MSG_META_CREATE_TEAM1) + CASE_LABEL(MSG_META_CREATE_TEAM2) + CASE_LABEL(MSG_META_CREATE_TEAM3) + CASE_LABEL(MSG_META_CREATE_TEAM4) + CASE_LABEL(MSG_META_CREATE_TEAM5) + CASE_LABEL(MSG_META_CREATE_TEAM6) + CASE_LABEL(MSG_META_CREATE_TEAM7) + CASE_LABEL(MSG_META_CREATE_TEAM8) + CASE_LABEL(MSG_META_CREATE_TEAM9) + CASE_LABEL(MSG_META_SELECT_TEAM0) + CASE_LABEL(MSG_META_SELECT_TEAM1) + CASE_LABEL(MSG_META_SELECT_TEAM2) + CASE_LABEL(MSG_META_SELECT_TEAM3) + CASE_LABEL(MSG_META_SELECT_TEAM4) + CASE_LABEL(MSG_META_SELECT_TEAM5) + CASE_LABEL(MSG_META_SELECT_TEAM6) + CASE_LABEL(MSG_META_SELECT_TEAM7) + CASE_LABEL(MSG_META_SELECT_TEAM8) + CASE_LABEL(MSG_META_SELECT_TEAM9) + CASE_LABEL(MSG_META_ADD_TEAM0) + CASE_LABEL(MSG_META_ADD_TEAM1) + CASE_LABEL(MSG_META_ADD_TEAM2) + CASE_LABEL(MSG_META_ADD_TEAM3) + CASE_LABEL(MSG_META_ADD_TEAM4) + CASE_LABEL(MSG_META_ADD_TEAM5) + CASE_LABEL(MSG_META_ADD_TEAM6) + CASE_LABEL(MSG_META_ADD_TEAM7) + CASE_LABEL(MSG_META_ADD_TEAM8) + CASE_LABEL(MSG_META_ADD_TEAM9) + CASE_LABEL(MSG_META_VIEW_TEAM0) + CASE_LABEL(MSG_META_VIEW_TEAM1) + CASE_LABEL(MSG_META_VIEW_TEAM2) + CASE_LABEL(MSG_META_VIEW_TEAM3) + CASE_LABEL(MSG_META_VIEW_TEAM4) + CASE_LABEL(MSG_META_VIEW_TEAM5) + CASE_LABEL(MSG_META_VIEW_TEAM6) + CASE_LABEL(MSG_META_VIEW_TEAM7) + CASE_LABEL(MSG_META_VIEW_TEAM8) + CASE_LABEL(MSG_META_VIEW_TEAM9) + CASE_LABEL(MSG_META_SELECT_MATCHING_UNITS) + CASE_LABEL(MSG_META_SELECT_NEXT_UNIT) + CASE_LABEL(MSG_META_SELECT_PREV_UNIT) + CASE_LABEL(MSG_META_SELECT_NEXT_WORKER) + CASE_LABEL(MSG_META_SELECT_PREV_WORKER) + CASE_LABEL(MSG_META_VIEW_COMMAND_CENTER) + CASE_LABEL(MSG_META_VIEW_LAST_RADAR_EVENT) + CASE_LABEL(MSG_META_SELECT_HERO) + CASE_LABEL(MSG_META_SELECT_ALL) + CASE_LABEL(MSG_META_SELECT_ALL_AIRCRAFT) + CASE_LABEL(MSG_META_SCATTER) + CASE_LABEL(MSG_META_STOP) + CASE_LABEL(MSG_META_DEPLOY) + CASE_LABEL(MSG_META_CREATE_FORMATION) + CASE_LABEL(MSG_META_FOLLOW) + CASE_LABEL(MSG_META_CHAT_PLAYERS) + CASE_LABEL(MSG_META_CHAT_ALLIES) + CASE_LABEL(MSG_META_CHAT_EVERYONE) + CASE_LABEL(MSG_META_DIPLOMACY) + CASE_LABEL(MSG_META_OPTIONS) #if defined(RTS_DEBUG) - CHECK_IF(MSG_META_HELP) + CASE_LABEL(MSG_META_HELP) #endif - CHECK_IF(MSG_META_TOGGLE_LOWER_DETAILS) - CHECK_IF(MSG_META_TOGGLE_CONTROL_BAR) - CHECK_IF(MSG_META_BEGIN_PATH_BUILD) - CHECK_IF(MSG_META_END_PATH_BUILD) - CHECK_IF(MSG_META_BEGIN_FORCEATTACK) - CHECK_IF(MSG_META_END_FORCEATTACK) - CHECK_IF(MSG_META_BEGIN_FORCEMOVE) - CHECK_IF(MSG_META_END_FORCEMOVE) - CHECK_IF(MSG_META_BEGIN_WAYPOINTS) - CHECK_IF(MSG_META_END_WAYPOINTS) - CHECK_IF(MSG_META_BEGIN_PREFER_SELECTION) - CHECK_IF(MSG_META_END_PREFER_SELECTION) - CHECK_IF(MSG_META_TAKE_SCREENSHOT) - CHECK_IF(MSG_META_ALL_CHEER) - CHECK_IF(MSG_META_TOGGLE_ATTACKMOVE) - CHECK_IF(MSG_META_BEGIN_CAMERA_ROTATE_LEFT) - CHECK_IF(MSG_META_END_CAMERA_ROTATE_LEFT) - CHECK_IF(MSG_META_BEGIN_CAMERA_ROTATE_RIGHT) - CHECK_IF(MSG_META_END_CAMERA_ROTATE_RIGHT) - CHECK_IF(MSG_META_BEGIN_CAMERA_ZOOM_IN) - CHECK_IF(MSG_META_END_CAMERA_ZOOM_IN) - CHECK_IF(MSG_META_BEGIN_CAMERA_ZOOM_OUT) - CHECK_IF(MSG_META_END_CAMERA_ZOOM_OUT) - CHECK_IF(MSG_META_CAMERA_RESET) - CHECK_IF(MSG_META_TOGGLE_CAMERA_TRACKING_DRAWABLE) - CHECK_IF(MSG_META_DEMO_INSTANT_QUIT) + CASE_LABEL(MSG_META_TOGGLE_LOWER_DETAILS) + CASE_LABEL(MSG_META_TOGGLE_CONTROL_BAR) + CASE_LABEL(MSG_META_BEGIN_PATH_BUILD) + CASE_LABEL(MSG_META_END_PATH_BUILD) + CASE_LABEL(MSG_META_BEGIN_FORCEATTACK) + CASE_LABEL(MSG_META_END_FORCEATTACK) + CASE_LABEL(MSG_META_BEGIN_FORCEMOVE) + CASE_LABEL(MSG_META_END_FORCEMOVE) + CASE_LABEL(MSG_META_BEGIN_WAYPOINTS) + CASE_LABEL(MSG_META_END_WAYPOINTS) + CASE_LABEL(MSG_META_BEGIN_PREFER_SELECTION) + CASE_LABEL(MSG_META_END_PREFER_SELECTION) + CASE_LABEL(MSG_META_TAKE_SCREENSHOT) + CASE_LABEL(MSG_META_ALL_CHEER) + CASE_LABEL(MSG_META_TOGGLE_ATTACKMOVE) + CASE_LABEL(MSG_META_BEGIN_CAMERA_ROTATE_LEFT) + CASE_LABEL(MSG_META_END_CAMERA_ROTATE_LEFT) + CASE_LABEL(MSG_META_BEGIN_CAMERA_ROTATE_RIGHT) + CASE_LABEL(MSG_META_END_CAMERA_ROTATE_RIGHT) + CASE_LABEL(MSG_META_BEGIN_CAMERA_ZOOM_IN) + CASE_LABEL(MSG_META_END_CAMERA_ZOOM_IN) + CASE_LABEL(MSG_META_BEGIN_CAMERA_ZOOM_OUT) + 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_DEMO_INSTANT_QUIT) #if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)//may be defined in GameCommon.h - CHECK_IF(MSG_CHEAT_RUNSCRIPT1) - CHECK_IF(MSG_CHEAT_RUNSCRIPT2) - CHECK_IF(MSG_CHEAT_RUNSCRIPT3) - CHECK_IF(MSG_CHEAT_RUNSCRIPT4) - CHECK_IF(MSG_CHEAT_RUNSCRIPT5) - CHECK_IF(MSG_CHEAT_RUNSCRIPT6) - CHECK_IF(MSG_CHEAT_RUNSCRIPT7) - CHECK_IF(MSG_CHEAT_RUNSCRIPT8) - CHECK_IF(MSG_CHEAT_RUNSCRIPT9) - CHECK_IF(MSG_CHEAT_TOGGLE_SPECIAL_POWER_DELAYS) - CHECK_IF(MSG_CHEAT_SWITCH_TEAMS) - CHECK_IF(MSG_CHEAT_KILL_SELECTION) - CHECK_IF(MSG_CHEAT_TOGGLE_HAND_OF_GOD_MODE) - CHECK_IF(MSG_CHEAT_INSTANT_BUILD) - CHECK_IF(MSG_CHEAT_DESHROUD) - CHECK_IF(MSG_CHEAT_ADD_CASH) - CHECK_IF(MSG_CHEAT_GIVE_ALL_SCIENCES) - CHECK_IF(MSG_CHEAT_GIVE_SCIENCEPURCHASEPOINTS) - CHECK_IF(MSG_CHEAT_SHOW_HEALTH) - CHECK_IF(MSG_CHEAT_TOGGLE_MESSAGE_TEXT) + CASE_LABEL(MSG_CHEAT_RUNSCRIPT1) + CASE_LABEL(MSG_CHEAT_RUNSCRIPT2) + CASE_LABEL(MSG_CHEAT_RUNSCRIPT3) + CASE_LABEL(MSG_CHEAT_RUNSCRIPT4) + CASE_LABEL(MSG_CHEAT_RUNSCRIPT5) + CASE_LABEL(MSG_CHEAT_RUNSCRIPT6) + CASE_LABEL(MSG_CHEAT_RUNSCRIPT7) + CASE_LABEL(MSG_CHEAT_RUNSCRIPT8) + CASE_LABEL(MSG_CHEAT_RUNSCRIPT9) + CASE_LABEL(MSG_CHEAT_TOGGLE_SPECIAL_POWER_DELAYS) + CASE_LABEL(MSG_CHEAT_SWITCH_TEAMS) + CASE_LABEL(MSG_CHEAT_KILL_SELECTION) + CASE_LABEL(MSG_CHEAT_TOGGLE_HAND_OF_GOD_MODE) + CASE_LABEL(MSG_CHEAT_INSTANT_BUILD) + CASE_LABEL(MSG_CHEAT_DESHROUD) + CASE_LABEL(MSG_CHEAT_ADD_CASH) + CASE_LABEL(MSG_CHEAT_GIVE_ALL_SCIENCES) + CASE_LABEL(MSG_CHEAT_GIVE_SCIENCEPURCHASEPOINTS) + CASE_LABEL(MSG_CHEAT_SHOW_HEALTH) + CASE_LABEL(MSG_CHEAT_TOGGLE_MESSAGE_TEXT) #endif - CHECK_IF(MSG_META_TOGGLE_FAST_FORWARD_REPLAY) - CHECK_IF(MSG_META_TOGGLE_PAUSE) - CHECK_IF(MSG_META_STEP_FRAME) + CASE_LABEL(MSG_META_TOGGLE_FAST_FORWARD_REPLAY) + CASE_LABEL(MSG_META_TOGGLE_PAUSE) + CASE_LABEL(MSG_META_STEP_FRAME) #if defined(RTS_DEBUG) - CHECK_IF(MSG_META_DEMO_TOGGLE_BEHIND_BUILDINGS) - CHECK_IF(MSG_META_DEMO_TOGGLE_LETTERBOX) - CHECK_IF(MSG_META_DEMO_TOGGLE_MESSAGE_TEXT) - CHECK_IF(MSG_META_DEMO_LOD_DECREASE) - CHECK_IF(MSG_META_DEMO_LOD_INCREASE) - CHECK_IF(MSG_META_DEMO_TOGGLE_ZOOM_LOCK) - CHECK_IF(MSG_META_DEMO_PLAY_CAMEO_MOVIE) - CHECK_IF(MSG_META_DEMO_TOGGLE_SPECIAL_POWER_DELAYS) - CHECK_IF(MSG_META_DEMO_BATTLE_CRY) - CHECK_IF(MSG_META_DEMO_SWITCH_TEAMS) - CHECK_IF(MSG_META_DEMO_SWITCH_TEAMS_BETWEEN_CHINA_USA) - CHECK_IF(MSG_META_DEMO_TOGGLE_PARTICLEDEBUG) - CHECK_IF(MSG_META_DEMO_TOGGLE_SHADOW_VOLUMES) - CHECK_IF(MSG_META_DEMO_TOGGLE_FOGOFWAR) - CHECK_IF(MSG_META_DEMO_KILL_ALL_ENEMIES) - CHECK_IF(MSG_META_DEMO_KILL_SELECTION) - CHECK_IF(MSG_META_DEMO_TOGGLE_HURT_ME_MODE) - CHECK_IF(MSG_META_DEMO_TOGGLE_HAND_OF_GOD_MODE) - CHECK_IF(MSG_META_DEMO_DEBUG_SELECTION) - CHECK_IF(MSG_META_DEMO_LOCK_CAMERA_TO_SELECTION) - CHECK_IF(MSG_META_DEMO_TOGGLE_SOUND) - CHECK_IF(MSG_META_DEMO_TOGGLE_TRACKMARKS) - CHECK_IF(MSG_META_DEMO_TOGGLE_WATERPLANE) - CHECK_IF(MSG_META_DEMO_TIME_OF_DAY) - CHECK_IF(MSG_META_DEMO_TOGGLE_MUSIC) - CHECK_IF(MSG_META_DEMO_MUSIC_NEXT_TRACK) - CHECK_IF(MSG_META_DEMO_MUSIC_PREV_TRACK) - CHECK_IF(MSG_META_DEMO_NEXT_OBJECTIVE_MOVIE) - CHECK_IF(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE1) - CHECK_IF(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE2) - CHECK_IF(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE3) - CHECK_IF(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE4) - CHECK_IF(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE5) - CHECK_IF(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE6) - CHECK_IF(MSG_META_DEMO_BEGIN_ADJUST_PITCH) - CHECK_IF(MSG_META_DEMO_END_ADJUST_PITCH) - CHECK_IF(MSG_META_DEMO_BEGIN_ADJUST_FOV) - CHECK_IF(MSG_META_DEMO_END_ADJUST_FOV) - CHECK_IF(MSG_META_DEMO_LOCK_CAMERA_TO_PLANES) - CHECK_IF(MSG_META_DEMO_REMOVE_PREREQ) - CHECK_IF(MSG_META_DEMO_INSTANT_BUILD) - CHECK_IF(MSG_META_DEMO_FREE_BUILD) - CHECK_IF(MSG_META_DEMO_RUNSCRIPT1) - CHECK_IF(MSG_META_DEMO_RUNSCRIPT2) - CHECK_IF(MSG_META_DEMO_RUNSCRIPT3) - CHECK_IF(MSG_META_DEMO_RUNSCRIPT4) - CHECK_IF(MSG_META_DEMO_RUNSCRIPT5) - CHECK_IF(MSG_META_DEMO_RUNSCRIPT6) - CHECK_IF(MSG_META_DEMO_RUNSCRIPT7) - CHECK_IF(MSG_META_DEMO_RUNSCRIPT8) - CHECK_IF(MSG_META_DEMO_RUNSCRIPT9) - CHECK_IF(MSG_META_DEMO_ENSHROUD) - CHECK_IF(MSG_META_DEMO_DESHROUD) - CHECK_IF(MSG_META_DEBUG_SHOW_EXTENTS) - CHECK_IF(MSG_META_DEBUG_SHOW_AUDIO_LOCATIONS) - CHECK_IF(MSG_META_DEBUG_SHOW_HEALTH) - CHECK_IF(MSG_META_DEBUG_GIVE_VETERANCY) - CHECK_IF(MSG_META_DEBUG_TAKE_VETERANCY) - CHECK_IF(MSG_META_DEMO_TOGGLE_AI_DEBUG) - CHECK_IF(MSG_META_DEMO_TOGGLE_SUPPLY_CENTER_PLACEMENT) - CHECK_IF(MSG_META_DEMO_TOGGLE_CAMERA_DEBUG) - CHECK_IF(MSG_META_DEMO_TOGGLE_AVI) - CHECK_IF(MSG_META_DEMO_TOGGLE_BW_VIEW) - CHECK_IF(MSG_META_DEMO_TOGGLE_RED_VIEW) - CHECK_IF(MSG_META_DEMO_TOGGLE_GREEN_VIEW) - CHECK_IF(MSG_META_DEMO_TOGGLE_MOTION_BLUR_ZOOM) - CHECK_IF(MSG_META_DEMO_TOGGLE_MILITARY_SUBTITLES) - CHECK_IF(MSG_META_DEMO_ADD_CASH) + CASE_LABEL(MSG_META_DEMO_TOGGLE_BEHIND_BUILDINGS) + CASE_LABEL(MSG_META_DEMO_TOGGLE_LETTERBOX) + CASE_LABEL(MSG_META_DEMO_TOGGLE_MESSAGE_TEXT) + CASE_LABEL(MSG_META_DEMO_LOD_DECREASE) + CASE_LABEL(MSG_META_DEMO_LOD_INCREASE) + CASE_LABEL(MSG_META_DEMO_TOGGLE_ZOOM_LOCK) + CASE_LABEL(MSG_META_DEMO_PLAY_CAMEO_MOVIE) + CASE_LABEL(MSG_META_DEMO_TOGGLE_SPECIAL_POWER_DELAYS) + CASE_LABEL(MSG_META_DEMO_BATTLE_CRY) + CASE_LABEL(MSG_META_DEMO_SWITCH_TEAMS) + CASE_LABEL(MSG_META_DEMO_SWITCH_TEAMS_BETWEEN_CHINA_USA) + CASE_LABEL(MSG_META_DEMO_TOGGLE_PARTICLEDEBUG) + CASE_LABEL(MSG_META_DEMO_TOGGLE_SHADOW_VOLUMES) + CASE_LABEL(MSG_META_DEMO_TOGGLE_FOGOFWAR) + CASE_LABEL(MSG_META_DEMO_KILL_ALL_ENEMIES) + CASE_LABEL(MSG_META_DEMO_KILL_SELECTION) + CASE_LABEL(MSG_META_DEMO_TOGGLE_HURT_ME_MODE) + CASE_LABEL(MSG_META_DEMO_TOGGLE_HAND_OF_GOD_MODE) + CASE_LABEL(MSG_META_DEMO_DEBUG_SELECTION) + CASE_LABEL(MSG_META_DEMO_LOCK_CAMERA_TO_SELECTION) + CASE_LABEL(MSG_META_DEMO_TOGGLE_SOUND) + CASE_LABEL(MSG_META_DEMO_TOGGLE_TRACKMARKS) + CASE_LABEL(MSG_META_DEMO_TOGGLE_WATERPLANE) + CASE_LABEL(MSG_META_DEMO_TIME_OF_DAY) + CASE_LABEL(MSG_META_DEMO_TOGGLE_MUSIC) + CASE_LABEL(MSG_META_DEMO_MUSIC_NEXT_TRACK) + CASE_LABEL(MSG_META_DEMO_MUSIC_PREV_TRACK) + CASE_LABEL(MSG_META_DEMO_NEXT_OBJECTIVE_MOVIE) + CASE_LABEL(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE1) + CASE_LABEL(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE2) + CASE_LABEL(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE3) + CASE_LABEL(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE4) + CASE_LABEL(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE5) + CASE_LABEL(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE6) + CASE_LABEL(MSG_META_DEMO_BEGIN_ADJUST_PITCH) + CASE_LABEL(MSG_META_DEMO_END_ADJUST_PITCH) + CASE_LABEL(MSG_META_DEMO_BEGIN_ADJUST_FOV) + CASE_LABEL(MSG_META_DEMO_END_ADJUST_FOV) + CASE_LABEL(MSG_META_DEMO_LOCK_CAMERA_TO_PLANES) + CASE_LABEL(MSG_META_DEMO_REMOVE_PREREQ) + CASE_LABEL(MSG_META_DEMO_INSTANT_BUILD) + CASE_LABEL(MSG_META_DEMO_FREE_BUILD) + CASE_LABEL(MSG_META_DEMO_RUNSCRIPT1) + CASE_LABEL(MSG_META_DEMO_RUNSCRIPT2) + CASE_LABEL(MSG_META_DEMO_RUNSCRIPT3) + CASE_LABEL(MSG_META_DEMO_RUNSCRIPT4) + CASE_LABEL(MSG_META_DEMO_RUNSCRIPT5) + CASE_LABEL(MSG_META_DEMO_RUNSCRIPT6) + CASE_LABEL(MSG_META_DEMO_RUNSCRIPT7) + CASE_LABEL(MSG_META_DEMO_RUNSCRIPT8) + CASE_LABEL(MSG_META_DEMO_RUNSCRIPT9) + CASE_LABEL(MSG_META_DEMO_ENSHROUD) + CASE_LABEL(MSG_META_DEMO_DESHROUD) + CASE_LABEL(MSG_META_DEBUG_SHOW_EXTENTS) + CASE_LABEL(MSG_META_DEBUG_SHOW_AUDIO_LOCATIONS) + CASE_LABEL(MSG_META_DEBUG_SHOW_HEALTH) + CASE_LABEL(MSG_META_DEBUG_GIVE_VETERANCY) + CASE_LABEL(MSG_META_DEBUG_TAKE_VETERANCY) + CASE_LABEL(MSG_META_DEMO_TOGGLE_AI_DEBUG) + CASE_LABEL(MSG_META_DEMO_TOGGLE_SUPPLY_CENTER_PLACEMENT) + CASE_LABEL(MSG_META_DEMO_TOGGLE_CAMERA_DEBUG) + CASE_LABEL(MSG_META_DEMO_TOGGLE_AVI) + CASE_LABEL(MSG_META_DEMO_TOGGLE_BW_VIEW) + CASE_LABEL(MSG_META_DEMO_TOGGLE_RED_VIEW) + CASE_LABEL(MSG_META_DEMO_TOGGLE_GREEN_VIEW) + CASE_LABEL(MSG_META_DEMO_TOGGLE_MOTION_BLUR_ZOOM) + CASE_LABEL(MSG_META_DEMO_TOGGLE_MILITARY_SUBTITLES) + CASE_LABEL(MSG_META_DEMO_ADD_CASH) #ifdef ALLOW_SURRENDER - CHECK_IF(MSG_META_DEMO_TEST_SURRENDER) + CASE_LABEL(MSG_META_DEMO_TEST_SURRENDER) #endif - CHECK_IF(MSG_META_DEMO_TOGGLE_RENDER) - CHECK_IF(MSG_META_DEMO_KILL_AREA_SELECTION) - CHECK_IF(MSG_META_DEMO_CYCLE_LOD_LEVEL) - CHECK_IF(MSG_META_DEBUG_INCR_ANIM_SKATE_SPEED) - CHECK_IF(MSG_META_DEBUG_DECR_ANIM_SKATE_SPEED) - CHECK_IF(MSG_META_DEBUG_CYCLE_EXTENT_TYPE) - CHECK_IF(MSG_META_DEBUG_INCREASE_EXTENT_MAJOR) - CHECK_IF(MSG_META_DEBUG_INCREASE_EXTENT_MAJOR_BIG) - CHECK_IF(MSG_META_DEBUG_DECREASE_EXTENT_MAJOR) - CHECK_IF(MSG_META_DEBUG_DECREASE_EXTENT_MAJOR_BIG) - CHECK_IF(MSG_META_DEBUG_INCREASE_EXTENT_MINOR) - CHECK_IF(MSG_META_DEBUG_INCREASE_EXTENT_MINOR_BIG) - CHECK_IF(MSG_META_DEBUG_DECREASE_EXTENT_MINOR) - CHECK_IF(MSG_META_DEBUG_DECREASE_EXTENT_MINOR_BIG) - CHECK_IF(MSG_META_DEBUG_INCREASE_EXTENT_HEIGHT) - CHECK_IF(MSG_META_DEBUG_INCREASE_EXTENT_HEIGHT_BIG) - CHECK_IF(MSG_META_DEBUG_DECREASE_EXTENT_HEIGHT) - CHECK_IF(MSG_META_DEBUG_DECREASE_EXTENT_HEIGHT_BIG) - CHECK_IF(MSG_META_DEBUG_VTUNE_ON) - CHECK_IF(MSG_META_DEBUG_VTUNE_OFF) - CHECK_IF(MSG_META_DEBUG_TOGGLE_FEATHER_WATER) - CHECK_IF(MSG_META_DEBUG_DUMP_ASSETS) - CHECK_IF(MSG_NO_DRAW) - CHECK_IF(MSG_META_DEMO_TOGGLE_METRICS) - CHECK_IF(MSG_META_DEMO_TOGGLE_PROJECTILEDEBUG) - CHECK_IF(MSG_META_DEMO_TOGGLE_VISIONDEBUG) - CHECK_IF(MSG_META_DEMO_TOGGLE_THREATDEBUG) - CHECK_IF(MSG_META_DEMO_TOGGLE_CASHMAPDEBUG) - CHECK_IF(MSG_META_DEMO_TOGGLE_GRAPHICALFRAMERATEBAR) - CHECK_IF(MSG_META_DEMO_GIVE_ALL_SCIENCES) - CHECK_IF(MSG_META_DEMO_GIVE_RANKLEVEL) - CHECK_IF(MSG_META_DEMO_TAKE_RANKLEVEL) - CHECK_IF(MSG_META_DEMO_GIVE_SCIENCEPURCHASEPOINTS) - CHECK_IF(MSG_META_DEBUG_TOGGLE_NETWORK) - CHECK_IF(MSG_META_DEBUG_DUMP_PLAYER_OBJECTS) - CHECK_IF(MSG_META_DEBUG_DUMP_ALL_PLAYER_OBJECTS) - CHECK_IF(MSG_META_DEBUG_OBJECT_ID_PERFORMANCE) - CHECK_IF(MSG_META_DEBUG_DRAWABLE_ID_PERFORMANCE) - CHECK_IF(MSG_META_DEBUG_SLEEPY_UPDATE_PERFORMANCE) - CHECK_IF(MSG_META_DEBUG_WIN) - CHECK_IF(MSG_META_DEMO_TOGGLE_DEBUG_STATS) + CASE_LABEL(MSG_META_DEMO_TOGGLE_RENDER) + CASE_LABEL(MSG_META_DEMO_KILL_AREA_SELECTION) + CASE_LABEL(MSG_META_DEMO_CYCLE_LOD_LEVEL) + CASE_LABEL(MSG_META_DEBUG_INCR_ANIM_SKATE_SPEED) + CASE_LABEL(MSG_META_DEBUG_DECR_ANIM_SKATE_SPEED) + CASE_LABEL(MSG_META_DEBUG_CYCLE_EXTENT_TYPE) + CASE_LABEL(MSG_META_DEBUG_INCREASE_EXTENT_MAJOR) + CASE_LABEL(MSG_META_DEBUG_INCREASE_EXTENT_MAJOR_BIG) + CASE_LABEL(MSG_META_DEBUG_DECREASE_EXTENT_MAJOR) + CASE_LABEL(MSG_META_DEBUG_DECREASE_EXTENT_MAJOR_BIG) + CASE_LABEL(MSG_META_DEBUG_INCREASE_EXTENT_MINOR) + CASE_LABEL(MSG_META_DEBUG_INCREASE_EXTENT_MINOR_BIG) + CASE_LABEL(MSG_META_DEBUG_DECREASE_EXTENT_MINOR) + CASE_LABEL(MSG_META_DEBUG_DECREASE_EXTENT_MINOR_BIG) + CASE_LABEL(MSG_META_DEBUG_INCREASE_EXTENT_HEIGHT) + CASE_LABEL(MSG_META_DEBUG_INCREASE_EXTENT_HEIGHT_BIG) + CASE_LABEL(MSG_META_DEBUG_DECREASE_EXTENT_HEIGHT) + CASE_LABEL(MSG_META_DEBUG_DECREASE_EXTENT_HEIGHT_BIG) + CASE_LABEL(MSG_META_DEBUG_VTUNE_ON) + CASE_LABEL(MSG_META_DEBUG_VTUNE_OFF) + CASE_LABEL(MSG_META_DEBUG_TOGGLE_FEATHER_WATER) + CASE_LABEL(MSG_META_DEBUG_DUMP_ASSETS) + CASE_LABEL(MSG_NO_DRAW) + CASE_LABEL(MSG_META_DEMO_TOGGLE_METRICS) + CASE_LABEL(MSG_META_DEMO_TOGGLE_PROJECTILEDEBUG) + CASE_LABEL(MSG_META_DEMO_TOGGLE_VISIONDEBUG) + CASE_LABEL(MSG_META_DEMO_TOGGLE_THREATDEBUG) + CASE_LABEL(MSG_META_DEMO_TOGGLE_CASHMAPDEBUG) + CASE_LABEL(MSG_META_DEMO_TOGGLE_GRAPHICALFRAMERATEBAR) + CASE_LABEL(MSG_META_DEMO_GIVE_ALL_SCIENCES) + CASE_LABEL(MSG_META_DEMO_GIVE_RANKLEVEL) + CASE_LABEL(MSG_META_DEMO_TAKE_RANKLEVEL) + CASE_LABEL(MSG_META_DEMO_GIVE_SCIENCEPURCHASEPOINTS) + CASE_LABEL(MSG_META_DEBUG_TOGGLE_NETWORK) + CASE_LABEL(MSG_META_DEBUG_DUMP_PLAYER_OBJECTS) + CASE_LABEL(MSG_META_DEBUG_DUMP_ALL_PLAYER_OBJECTS) + CASE_LABEL(MSG_META_DEBUG_OBJECT_ID_PERFORMANCE) + CASE_LABEL(MSG_META_DEBUG_DRAWABLE_ID_PERFORMANCE) + CASE_LABEL(MSG_META_DEBUG_SLEEPY_UPDATE_PERFORMANCE) + CASE_LABEL(MSG_META_DEBUG_WIN) + CASE_LABEL(MSG_META_DEMO_TOGGLE_DEBUG_STATS) #endif // defined(RTS_DEBUG) #if defined(RTS_DEBUG) - CHECK_IF(MSG_META_DEMO_TOGGLE_AUDIODEBUG) + CASE_LABEL(MSG_META_DEMO_TOGGLE_AUDIODEBUG) #endif//defined(RTS_DEBUG) #ifdef DUMP_PERF_STATS - CHECK_IF(MSG_META_DEMO_PERFORM_STATISTICAL_DUMP) + CASE_LABEL(MSG_META_DEMO_PERFORM_STATISTICAL_DUMP) #endif//DUMP_PERF_STATS - CHECK_IF(MSG_META_PLACE_BEACON) - CHECK_IF(MSG_META_REMOVE_BEACON) - CHECK_IF(MSG_END_META_MESSAGES) - CHECK_IF(MSG_MOUSEOVER_DRAWABLE_HINT) - CHECK_IF(MSG_MOUSEOVER_LOCATION_HINT) - CHECK_IF(MSG_VALID_GUICOMMAND_HINT) - CHECK_IF(MSG_INVALID_GUICOMMAND_HINT) - CHECK_IF(MSG_AREA_SELECTION_HINT) - CHECK_IF(MSG_DO_ATTACK_OBJECT_HINT) - CHECK_IF(MSG_DO_ATTACK_OBJECT_AFTER_MOVING_HINT) - CHECK_IF(MSG_DO_FORCE_ATTACK_OBJECT_HINT) - CHECK_IF(MSG_DO_FORCE_ATTACK_GROUND_HINT) - CHECK_IF(MSG_GET_REPAIRED_HINT) - CHECK_IF(MSG_GET_HEALED_HINT) - CHECK_IF(MSG_DO_REPAIR_HINT) - CHECK_IF(MSG_RESUME_CONSTRUCTION_HINT) - CHECK_IF(MSG_ENTER_HINT) - CHECK_IF(MSG_DOCK_HINT) - CHECK_IF(MSG_DO_MOVETO_HINT) - CHECK_IF(MSG_DO_ATTACKMOVETO_HINT) - CHECK_IF(MSG_ADD_WAYPOINT_HINT) - CHECK_IF(MSG_HIJACK_HINT) - CHECK_IF(MSG_SABOTAGE_HINT) - CHECK_IF(MSG_FIREBOMB_HINT) - CHECK_IF(MSG_CONVERT_TO_CARBOMB_HINT) - CHECK_IF(MSG_CAPTUREBUILDING_HINT) - CHECK_IF(MSG_HACK_HINT) + CASE_LABEL(MSG_META_PLACE_BEACON) + CASE_LABEL(MSG_META_REMOVE_BEACON) + CASE_LABEL(MSG_END_META_MESSAGES) + CASE_LABEL(MSG_MOUSEOVER_DRAWABLE_HINT) + CASE_LABEL(MSG_MOUSEOVER_LOCATION_HINT) + CASE_LABEL(MSG_VALID_GUICOMMAND_HINT) + CASE_LABEL(MSG_INVALID_GUICOMMAND_HINT) + CASE_LABEL(MSG_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) + CASE_LABEL(MSG_GET_HEALED_HINT) + CASE_LABEL(MSG_DO_REPAIR_HINT) + CASE_LABEL(MSG_RESUME_CONSTRUCTION_HINT) + CASE_LABEL(MSG_ENTER_HINT) + CASE_LABEL(MSG_DOCK_HINT) + CASE_LABEL(MSG_DO_MOVETO_HINT) + CASE_LABEL(MSG_DO_ATTACKMOVETO_HINT) + CASE_LABEL(MSG_ADD_WAYPOINT_HINT) + CASE_LABEL(MSG_HIJACK_HINT) + CASE_LABEL(MSG_SABOTAGE_HINT) + 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 - CHECK_IF(MSG_PICK_UP_PRISONER_HINT) + CASE_LABEL(MSG_PICK_UP_PRISONER_HINT) #endif - CHECK_IF(MSG_SNIPE_VEHICLE_HINT) - CHECK_IF(MSG_DEFECTOR_HINT) - CHECK_IF(MSG_SET_RALLY_POINT_HINT) - CHECK_IF(MSG_DO_SALVAGE_HINT) - CHECK_IF(MSG_DO_INVALID_HINT) - CHECK_IF(MSG_BEGIN_NETWORK_MESSAGES) - CHECK_IF(MSG_CREATE_SELECTED_GROUP) - CHECK_IF(MSG_CREATE_SELECTED_GROUP_NO_SOUND) - CHECK_IF(MSG_DESTROY_SELECTED_GROUP) - CHECK_IF(MSG_REMOVE_FROM_SELECTED_GROUP) - CHECK_IF(MSG_SELECTED_GROUP_COMMAND) - CHECK_IF(MSG_CREATE_TEAM0) - CHECK_IF(MSG_CREATE_TEAM1) - CHECK_IF(MSG_CREATE_TEAM2) - CHECK_IF(MSG_CREATE_TEAM3) - CHECK_IF(MSG_CREATE_TEAM4) - CHECK_IF(MSG_CREATE_TEAM5) - CHECK_IF(MSG_CREATE_TEAM6) - CHECK_IF(MSG_CREATE_TEAM7) - CHECK_IF(MSG_CREATE_TEAM8) - CHECK_IF(MSG_CREATE_TEAM9) - CHECK_IF(MSG_SELECT_TEAM0) - CHECK_IF(MSG_SELECT_TEAM1) - CHECK_IF(MSG_SELECT_TEAM2) - CHECK_IF(MSG_SELECT_TEAM3) - CHECK_IF(MSG_SELECT_TEAM4) - CHECK_IF(MSG_SELECT_TEAM5) - CHECK_IF(MSG_SELECT_TEAM6) - CHECK_IF(MSG_SELECT_TEAM7) - CHECK_IF(MSG_SELECT_TEAM8) - CHECK_IF(MSG_SELECT_TEAM9) - CHECK_IF(MSG_ADD_TEAM0) - CHECK_IF(MSG_ADD_TEAM1) - CHECK_IF(MSG_ADD_TEAM2) - CHECK_IF(MSG_ADD_TEAM3) - CHECK_IF(MSG_ADD_TEAM4) - CHECK_IF(MSG_ADD_TEAM5) - CHECK_IF(MSG_ADD_TEAM6) - CHECK_IF(MSG_ADD_TEAM7) - CHECK_IF(MSG_ADD_TEAM8) - CHECK_IF(MSG_ADD_TEAM9) - CHECK_IF(MSG_DO_ATTACKSQUAD) - CHECK_IF(MSG_DO_WEAPON) - CHECK_IF(MSG_DO_WEAPON_AT_LOCATION) - CHECK_IF(MSG_DO_WEAPON_AT_OBJECT) - CHECK_IF(MSG_DO_SPECIAL_POWER) - CHECK_IF(MSG_DO_SPECIAL_POWER_AT_LOCATION) - CHECK_IF(MSG_DO_SPECIAL_POWER_AT_OBJECT) - CHECK_IF(MSG_SET_RALLY_POINT) - CHECK_IF(MSG_PURCHASE_SCIENCE) - CHECK_IF(MSG_QUEUE_UPGRADE) - CHECK_IF(MSG_CANCEL_UPGRADE) - CHECK_IF(MSG_QUEUE_UNIT_CREATE) - CHECK_IF(MSG_CANCEL_UNIT_CREATE) - CHECK_IF(MSG_DOZER_CONSTRUCT) - CHECK_IF(MSG_DOZER_CONSTRUCT_LINE) - CHECK_IF(MSG_DOZER_CANCEL_CONSTRUCT) - CHECK_IF(MSG_SELL) - CHECK_IF(MSG_EXIT) - CHECK_IF(MSG_EVACUATE) - CHECK_IF(MSG_EXECUTE_RAILED_TRANSPORT) - CHECK_IF(MSG_COMBATDROP_AT_LOCATION) - CHECK_IF(MSG_COMBATDROP_AT_OBJECT) - CHECK_IF(MSG_AREA_SELECTION) - CHECK_IF(MSG_DO_ATTACK_OBJECT) - CHECK_IF(MSG_DO_FORCE_ATTACK_OBJECT) - CHECK_IF(MSG_DO_FORCE_ATTACK_GROUND) - CHECK_IF(MSG_GET_REPAIRED) - CHECK_IF(MSG_GET_HEALED) - CHECK_IF(MSG_DO_REPAIR) - CHECK_IF(MSG_RESUME_CONSTRUCTION) - CHECK_IF(MSG_ENTER) - CHECK_IF(MSG_DOCK) - CHECK_IF(MSG_DO_MOVETO) - CHECK_IF(MSG_DO_ATTACKMOVETO) - CHECK_IF(MSG_DO_FORCEMOVETO) - CHECK_IF(MSG_ADD_WAYPOINT) - CHECK_IF(MSG_DO_GUARD_POSITION) - CHECK_IF(MSG_DO_GUARD_OBJECT) - CHECK_IF(MSG_DO_STOP) - CHECK_IF(MSG_DO_SCATTER) - CHECK_IF(MSG_INTERNET_HACK) - CHECK_IF(MSG_DO_CHEER) + CASE_LABEL(MSG_SNIPE_VEHICLE_HINT) + CASE_LABEL(MSG_DEFECTOR_HINT) + CASE_LABEL(MSG_SET_RALLY_POINT_HINT) + CASE_LABEL(MSG_DO_SALVAGE_HINT) + CASE_LABEL(MSG_DO_INVALID_HINT) + CASE_LABEL(MSG_BEGIN_NETWORK_MESSAGES) + CASE_LABEL(MSG_CREATE_SELECTED_GROUP) + CASE_LABEL(MSG_CREATE_SELECTED_GROUP_NO_SOUND) + CASE_LABEL(MSG_DESTROY_SELECTED_GROUP) + CASE_LABEL(MSG_REMOVE_FROM_SELECTED_GROUP) + CASE_LABEL(MSG_SELECTED_GROUP_COMMAND) + CASE_LABEL(MSG_CREATE_TEAM0) + CASE_LABEL(MSG_CREATE_TEAM1) + CASE_LABEL(MSG_CREATE_TEAM2) + CASE_LABEL(MSG_CREATE_TEAM3) + CASE_LABEL(MSG_CREATE_TEAM4) + CASE_LABEL(MSG_CREATE_TEAM5) + CASE_LABEL(MSG_CREATE_TEAM6) + CASE_LABEL(MSG_CREATE_TEAM7) + CASE_LABEL(MSG_CREATE_TEAM8) + CASE_LABEL(MSG_CREATE_TEAM9) + CASE_LABEL(MSG_SELECT_TEAM0) + CASE_LABEL(MSG_SELECT_TEAM1) + CASE_LABEL(MSG_SELECT_TEAM2) + CASE_LABEL(MSG_SELECT_TEAM3) + CASE_LABEL(MSG_SELECT_TEAM4) + CASE_LABEL(MSG_SELECT_TEAM5) + CASE_LABEL(MSG_SELECT_TEAM6) + CASE_LABEL(MSG_SELECT_TEAM7) + CASE_LABEL(MSG_SELECT_TEAM8) + CASE_LABEL(MSG_SELECT_TEAM9) + CASE_LABEL(MSG_ADD_TEAM0) + CASE_LABEL(MSG_ADD_TEAM1) + CASE_LABEL(MSG_ADD_TEAM2) + CASE_LABEL(MSG_ADD_TEAM3) + CASE_LABEL(MSG_ADD_TEAM4) + CASE_LABEL(MSG_ADD_TEAM5) + CASE_LABEL(MSG_ADD_TEAM6) + CASE_LABEL(MSG_ADD_TEAM7) + CASE_LABEL(MSG_ADD_TEAM8) + CASE_LABEL(MSG_ADD_TEAM9) + CASE_LABEL(MSG_DO_ATTACKSQUAD) + CASE_LABEL(MSG_DO_WEAPON) + CASE_LABEL(MSG_DO_WEAPON_AT_LOCATION) + CASE_LABEL(MSG_DO_WEAPON_AT_OBJECT) + CASE_LABEL(MSG_DO_SPECIAL_POWER) + CASE_LABEL(MSG_DO_SPECIAL_POWER_AT_LOCATION) + CASE_LABEL(MSG_DO_SPECIAL_POWER_AT_OBJECT) + CASE_LABEL(MSG_SET_RALLY_POINT) + CASE_LABEL(MSG_PURCHASE_SCIENCE) + CASE_LABEL(MSG_QUEUE_UPGRADE) + CASE_LABEL(MSG_CANCEL_UPGRADE) + CASE_LABEL(MSG_QUEUE_UNIT_CREATE) + CASE_LABEL(MSG_CANCEL_UNIT_CREATE) + CASE_LABEL(MSG_DOZER_CONSTRUCT) + CASE_LABEL(MSG_DOZER_CONSTRUCT_LINE) + CASE_LABEL(MSG_DOZER_CANCEL_CONSTRUCT) + CASE_LABEL(MSG_SELL) + CASE_LABEL(MSG_EXIT) + CASE_LABEL(MSG_EVACUATE) + CASE_LABEL(MSG_EXECUTE_RAILED_TRANSPORT) + CASE_LABEL(MSG_COMBATDROP_AT_LOCATION) + CASE_LABEL(MSG_COMBATDROP_AT_OBJECT) + CASE_LABEL(MSG_AREA_SELECTION) + CASE_LABEL(MSG_DO_ATTACK_OBJECT) + CASE_LABEL(MSG_DO_FORCE_ATTACK_OBJECT) + CASE_LABEL(MSG_DO_FORCE_ATTACK_GROUND) + CASE_LABEL(MSG_GET_REPAIRED) + CASE_LABEL(MSG_GET_HEALED) + CASE_LABEL(MSG_DO_REPAIR) + CASE_LABEL(MSG_RESUME_CONSTRUCTION) + CASE_LABEL(MSG_ENTER) + CASE_LABEL(MSG_DOCK) + CASE_LABEL(MSG_DO_MOVETO) + CASE_LABEL(MSG_DO_ATTACKMOVETO) + CASE_LABEL(MSG_DO_FORCEMOVETO) + CASE_LABEL(MSG_ADD_WAYPOINT) + CASE_LABEL(MSG_DO_GUARD_POSITION) + CASE_LABEL(MSG_DO_GUARD_OBJECT) + CASE_LABEL(MSG_DO_STOP) + CASE_LABEL(MSG_DO_SCATTER) + CASE_LABEL(MSG_INTERNET_HACK) + CASE_LABEL(MSG_DO_CHEER) #ifdef ALLOW_SURRENDER - CHECK_IF(MSG_DO_SURRENDER) + CASE_LABEL(MSG_DO_SURRENDER) #endif - CHECK_IF(MSG_TOGGLE_OVERCHARGE) + CASE_LABEL(MSG_TOGGLE_OVERCHARGE) #ifdef ALLOW_SURRENDER - CHECK_IF(MSG_RETURN_TO_PRISON) + CASE_LABEL(MSG_RETURN_TO_PRISON) #endif - CHECK_IF(MSG_SWITCH_WEAPONS) - CHECK_IF(MSG_CONVERT_TO_CARBOMB) - CHECK_IF(MSG_CAPTUREBUILDING) - CHECK_IF(MSG_DISABLEVEHICLE_HACK) - CHECK_IF(MSG_STEALCASH_HACK) - CHECK_IF(MSG_DISABLEBUILDING_HACK) - CHECK_IF(MSG_SNIPE_VEHICLE) + CASE_LABEL(MSG_SWITCH_WEAPONS) + CASE_LABEL(MSG_CONVERT_TO_CARBOMB) + CASE_LABEL(MSG_CAPTUREBUILDING) + CASE_LABEL(MSG_DISABLEVEHICLE_HACK) + CASE_LABEL(MSG_STEALCASH_HACK) + CASE_LABEL(MSG_DISABLEBUILDING_HACK) + CASE_LABEL(MSG_SNIPE_VEHICLE) #ifdef ALLOW_SURRENDER - CHECK_IF(MSG_PICK_UP_PRISONER) + CASE_LABEL(MSG_PICK_UP_PRISONER) #endif - CHECK_IF(MSG_DO_SALVAGE) - CHECK_IF(MSG_CLEAR_INGAME_POPUP_MESSAGE) - CHECK_IF(MSG_PLACE_BEACON) - CHECK_IF(MSG_REMOVE_BEACON) - CHECK_IF(MSG_SET_BEACON_TEXT) - CHECK_IF(MSG_SET_REPLAY_CAMERA) - CHECK_IF(MSG_SELF_DESTRUCT) - CHECK_IF(MSG_CREATE_FORMATION) - CHECK_IF(MSG_LOGIC_CRC) + CASE_LABEL(MSG_DO_SALVAGE) + CASE_LABEL(MSG_CLEAR_INGAME_POPUP_MESSAGE) + CASE_LABEL(MSG_PLACE_BEACON) + CASE_LABEL(MSG_REMOVE_BEACON) + CASE_LABEL(MSG_SET_BEACON_TEXT) + CASE_LABEL(MSG_SET_REPLAY_CAMERA) + CASE_LABEL(MSG_SELF_DESTRUCT) + CASE_LABEL(MSG_CREATE_FORMATION) + CASE_LABEL(MSG_LOGIC_CRC) #if defined(RTS_DEBUG) - CHECK_IF(MSG_DEBUG_KILL_SELECTION) - CHECK_IF(MSG_DEBUG_HURT_OBJECT) - CHECK_IF(MSG_DEBUG_KILL_OBJECT) + CASE_LABEL(MSG_DEBUG_KILL_SELECTION) + CASE_LABEL(MSG_DEBUG_HURT_OBJECT) + CASE_LABEL(MSG_DEBUG_KILL_OBJECT) #endif - CHECK_IF(MSG_END_NETWORK_MESSAGES) - CHECK_IF(MSG_TIMESTAMP) - CHECK_IF(MSG_OBJECT_CREATED) - CHECK_IF(MSG_OBJECT_DESTROYED) - CHECK_IF(MSG_OBJECT_POSITION) - CHECK_IF(MSG_OBJECT_ORIENTATION) - CHECK_IF(MSG_OBJECT_JOINED_TEAM) - CHECK_IF(MSG_SET_MINE_CLEARING_DETAIL) - CHECK_IF(MSG_ENABLE_RETALIATION_MODE) + CASE_LABEL(MSG_END_NETWORK_MESSAGES) + CASE_LABEL(MSG_TIMESTAMP) + CASE_LABEL(MSG_OBJECT_CREATED) + CASE_LABEL(MSG_OBJECT_DESTROYED) + 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) return commandName; } From 569f420d0c50877865699c0282ce4effab0935c0 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Thu, 10 Jul 2025 23:58:44 +0200 Subject: [PATCH 2/9] Renamed macro, no other change. --- .../Source/Common/MessageStream.cpp | 772 +++++++++--------- 1 file changed, 386 insertions(+), 386 deletions(-) diff --git a/Generals/Code/GameEngine/Source/Common/MessageStream.cpp b/Generals/Code/GameEngine/Source/Common/MessageStream.cpp index d6d0805caa..dbc8b55714 100644 --- a/Generals/Code/GameEngine/Source/Common/MessageStream.cpp +++ b/Generals/Code/GameEngine/Source/Common/MessageStream.cpp @@ -230,420 +230,420 @@ AsciiString GameMessage::getCommandAsAsciiString( void ) AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) { -#define CHECK_IF(x) if (t == x) { return #x; } +#define CASE_LABEL(x) if (t == x) { return #x; } AsciiString commandName = "UnknownMessage"; if (t >= GameMessage::MSG_COUNT) { commandName = "Invalid command"; } - CHECK_IF(MSG_INVALID) - CHECK_IF(MSG_FRAME_TICK) - CHECK_IF(MSG_RAW_MOUSE_BEGIN) - CHECK_IF(MSG_RAW_MOUSE_POSITION) - CHECK_IF(MSG_RAW_MOUSE_LEFT_BUTTON_DOWN) - CHECK_IF(MSG_RAW_MOUSE_LEFT_DOUBLE_CLICK) - CHECK_IF(MSG_RAW_MOUSE_LEFT_BUTTON_UP) - CHECK_IF(MSG_RAW_MOUSE_LEFT_CLICK) - CHECK_IF(MSG_RAW_MOUSE_LEFT_DRAG) - CHECK_IF(MSG_RAW_MOUSE_MIDDLE_BUTTON_DOWN) - CHECK_IF(MSG_RAW_MOUSE_MIDDLE_DOUBLE_CLICK) - CHECK_IF(MSG_RAW_MOUSE_MIDDLE_BUTTON_UP) - CHECK_IF(MSG_RAW_MOUSE_MIDDLE_DRAG) - CHECK_IF(MSG_RAW_MOUSE_RIGHT_BUTTON_DOWN) - CHECK_IF(MSG_RAW_MOUSE_RIGHT_DOUBLE_CLICK) - CHECK_IF(MSG_RAW_MOUSE_RIGHT_BUTTON_UP) - CHECK_IF(MSG_RAW_MOUSE_RIGHT_DRAG) - CHECK_IF(MSG_RAW_MOUSE_WHEEL) - CHECK_IF(MSG_RAW_MOUSE_END) - CHECK_IF(MSG_RAW_KEY_DOWN) - CHECK_IF(MSG_RAW_KEY_UP) - CHECK_IF(MSG_MOUSE_LEFT_CLICK) - CHECK_IF(MSG_MOUSE_LEFT_DOUBLE_CLICK) - CHECK_IF(MSG_MOUSE_MIDDLE_CLICK) - CHECK_IF(MSG_MOUSE_MIDDLE_DOUBLE_CLICK) - CHECK_IF(MSG_MOUSE_RIGHT_CLICK) - CHECK_IF(MSG_MOUSE_RIGHT_DOUBLE_CLICK) - CHECK_IF(MSG_CLEAR_GAME_DATA) - CHECK_IF(MSG_NEW_GAME) - CHECK_IF(MSG_BEGIN_META_MESSAGES) - CHECK_IF(MSG_META_SAVE_VIEW1) - CHECK_IF(MSG_META_SAVE_VIEW2) - CHECK_IF(MSG_META_SAVE_VIEW3) - CHECK_IF(MSG_META_SAVE_VIEW4) - CHECK_IF(MSG_META_SAVE_VIEW5) - CHECK_IF(MSG_META_SAVE_VIEW6) - CHECK_IF(MSG_META_SAVE_VIEW7) - CHECK_IF(MSG_META_SAVE_VIEW8) - CHECK_IF(MSG_META_VIEW_VIEW1) - CHECK_IF(MSG_META_VIEW_VIEW2) - CHECK_IF(MSG_META_VIEW_VIEW3) - CHECK_IF(MSG_META_VIEW_VIEW4) - CHECK_IF(MSG_META_VIEW_VIEW5) - CHECK_IF(MSG_META_VIEW_VIEW6) - CHECK_IF(MSG_META_VIEW_VIEW7) - CHECK_IF(MSG_META_VIEW_VIEW8) - CHECK_IF(MSG_META_CREATE_TEAM0) - CHECK_IF(MSG_META_CREATE_TEAM1) - CHECK_IF(MSG_META_CREATE_TEAM2) - CHECK_IF(MSG_META_CREATE_TEAM3) - CHECK_IF(MSG_META_CREATE_TEAM4) - CHECK_IF(MSG_META_CREATE_TEAM5) - CHECK_IF(MSG_META_CREATE_TEAM6) - CHECK_IF(MSG_META_CREATE_TEAM7) - CHECK_IF(MSG_META_CREATE_TEAM8) - CHECK_IF(MSG_META_CREATE_TEAM9) - CHECK_IF(MSG_META_SELECT_TEAM0) - CHECK_IF(MSG_META_SELECT_TEAM1) - CHECK_IF(MSG_META_SELECT_TEAM2) - CHECK_IF(MSG_META_SELECT_TEAM3) - CHECK_IF(MSG_META_SELECT_TEAM4) - CHECK_IF(MSG_META_SELECT_TEAM5) - CHECK_IF(MSG_META_SELECT_TEAM6) - CHECK_IF(MSG_META_SELECT_TEAM7) - CHECK_IF(MSG_META_SELECT_TEAM8) - CHECK_IF(MSG_META_SELECT_TEAM9) - CHECK_IF(MSG_META_ADD_TEAM0) - CHECK_IF(MSG_META_ADD_TEAM1) - CHECK_IF(MSG_META_ADD_TEAM2) - CHECK_IF(MSG_META_ADD_TEAM3) - CHECK_IF(MSG_META_ADD_TEAM4) - CHECK_IF(MSG_META_ADD_TEAM5) - CHECK_IF(MSG_META_ADD_TEAM6) - CHECK_IF(MSG_META_ADD_TEAM7) - CHECK_IF(MSG_META_ADD_TEAM8) - CHECK_IF(MSG_META_ADD_TEAM9) - CHECK_IF(MSG_META_VIEW_TEAM0) - CHECK_IF(MSG_META_VIEW_TEAM1) - CHECK_IF(MSG_META_VIEW_TEAM2) - CHECK_IF(MSG_META_VIEW_TEAM3) - CHECK_IF(MSG_META_VIEW_TEAM4) - CHECK_IF(MSG_META_VIEW_TEAM5) - CHECK_IF(MSG_META_VIEW_TEAM6) - CHECK_IF(MSG_META_VIEW_TEAM7) - CHECK_IF(MSG_META_VIEW_TEAM8) - CHECK_IF(MSG_META_VIEW_TEAM9) - CHECK_IF(MSG_META_SELECT_MATCHING_UNITS) - CHECK_IF(MSG_META_SELECT_NEXT_UNIT) - CHECK_IF(MSG_META_SELECT_PREV_UNIT) - CHECK_IF(MSG_META_SELECT_NEXT_WORKER) - CHECK_IF(MSG_META_SELECT_PREV_WORKER) - CHECK_IF(MSG_META_VIEW_COMMAND_CENTER) - CHECK_IF(MSG_META_VIEW_LAST_RADAR_EVENT) - CHECK_IF(MSG_META_SELECT_HERO) - CHECK_IF(MSG_META_SELECT_ALL) - CHECK_IF(MSG_META_SELECT_ALL_AIRCRAFT) - CHECK_IF(MSG_META_SCATTER) - CHECK_IF(MSG_META_STOP) - CHECK_IF(MSG_META_DEPLOY) - CHECK_IF(MSG_META_CREATE_FORMATION) - CHECK_IF(MSG_META_FOLLOW) - CHECK_IF(MSG_META_CHAT_PLAYERS) - CHECK_IF(MSG_META_CHAT_ALLIES) - CHECK_IF(MSG_META_CHAT_EVERYONE) - CHECK_IF(MSG_META_DIPLOMACY) - CHECK_IF(MSG_META_OPTIONS) + CASE_LABEL(MSG_INVALID) + CASE_LABEL(MSG_FRAME_TICK) + CASE_LABEL(MSG_RAW_MOUSE_BEGIN) + CASE_LABEL(MSG_RAW_MOUSE_POSITION) + CASE_LABEL(MSG_RAW_MOUSE_LEFT_BUTTON_DOWN) + CASE_LABEL(MSG_RAW_MOUSE_LEFT_DOUBLE_CLICK) + CASE_LABEL(MSG_RAW_MOUSE_LEFT_BUTTON_UP) + CASE_LABEL(MSG_RAW_MOUSE_LEFT_CLICK) + CASE_LABEL(MSG_RAW_MOUSE_LEFT_DRAG) + CASE_LABEL(MSG_RAW_MOUSE_MIDDLE_BUTTON_DOWN) + CASE_LABEL(MSG_RAW_MOUSE_MIDDLE_DOUBLE_CLICK) + CASE_LABEL(MSG_RAW_MOUSE_MIDDLE_BUTTON_UP) + CASE_LABEL(MSG_RAW_MOUSE_MIDDLE_DRAG) + CASE_LABEL(MSG_RAW_MOUSE_RIGHT_BUTTON_DOWN) + CASE_LABEL(MSG_RAW_MOUSE_RIGHT_DOUBLE_CLICK) + CASE_LABEL(MSG_RAW_MOUSE_RIGHT_BUTTON_UP) + CASE_LABEL(MSG_RAW_MOUSE_RIGHT_DRAG) + CASE_LABEL(MSG_RAW_MOUSE_WHEEL) + CASE_LABEL(MSG_RAW_MOUSE_END) + CASE_LABEL(MSG_RAW_KEY_DOWN) + CASE_LABEL(MSG_RAW_KEY_UP) + CASE_LABEL(MSG_MOUSE_LEFT_CLICK) + CASE_LABEL(MSG_MOUSE_LEFT_DOUBLE_CLICK) + CASE_LABEL(MSG_MOUSE_MIDDLE_CLICK) + CASE_LABEL(MSG_MOUSE_MIDDLE_DOUBLE_CLICK) + CASE_LABEL(MSG_MOUSE_RIGHT_CLICK) + CASE_LABEL(MSG_MOUSE_RIGHT_DOUBLE_CLICK) + CASE_LABEL(MSG_CLEAR_GAME_DATA) + CASE_LABEL(MSG_NEW_GAME) + CASE_LABEL(MSG_BEGIN_META_MESSAGES) + CASE_LABEL(MSG_META_SAVE_VIEW1) + CASE_LABEL(MSG_META_SAVE_VIEW2) + CASE_LABEL(MSG_META_SAVE_VIEW3) + CASE_LABEL(MSG_META_SAVE_VIEW4) + CASE_LABEL(MSG_META_SAVE_VIEW5) + CASE_LABEL(MSG_META_SAVE_VIEW6) + CASE_LABEL(MSG_META_SAVE_VIEW7) + CASE_LABEL(MSG_META_SAVE_VIEW8) + CASE_LABEL(MSG_META_VIEW_VIEW1) + CASE_LABEL(MSG_META_VIEW_VIEW2) + CASE_LABEL(MSG_META_VIEW_VIEW3) + CASE_LABEL(MSG_META_VIEW_VIEW4) + CASE_LABEL(MSG_META_VIEW_VIEW5) + CASE_LABEL(MSG_META_VIEW_VIEW6) + CASE_LABEL(MSG_META_VIEW_VIEW7) + CASE_LABEL(MSG_META_VIEW_VIEW8) + CASE_LABEL(MSG_META_CREATE_TEAM0) + CASE_LABEL(MSG_META_CREATE_TEAM1) + CASE_LABEL(MSG_META_CREATE_TEAM2) + CASE_LABEL(MSG_META_CREATE_TEAM3) + CASE_LABEL(MSG_META_CREATE_TEAM4) + CASE_LABEL(MSG_META_CREATE_TEAM5) + CASE_LABEL(MSG_META_CREATE_TEAM6) + CASE_LABEL(MSG_META_CREATE_TEAM7) + CASE_LABEL(MSG_META_CREATE_TEAM8) + CASE_LABEL(MSG_META_CREATE_TEAM9) + CASE_LABEL(MSG_META_SELECT_TEAM0) + CASE_LABEL(MSG_META_SELECT_TEAM1) + CASE_LABEL(MSG_META_SELECT_TEAM2) + CASE_LABEL(MSG_META_SELECT_TEAM3) + CASE_LABEL(MSG_META_SELECT_TEAM4) + CASE_LABEL(MSG_META_SELECT_TEAM5) + CASE_LABEL(MSG_META_SELECT_TEAM6) + CASE_LABEL(MSG_META_SELECT_TEAM7) + CASE_LABEL(MSG_META_SELECT_TEAM8) + CASE_LABEL(MSG_META_SELECT_TEAM9) + CASE_LABEL(MSG_META_ADD_TEAM0) + CASE_LABEL(MSG_META_ADD_TEAM1) + CASE_LABEL(MSG_META_ADD_TEAM2) + CASE_LABEL(MSG_META_ADD_TEAM3) + CASE_LABEL(MSG_META_ADD_TEAM4) + CASE_LABEL(MSG_META_ADD_TEAM5) + CASE_LABEL(MSG_META_ADD_TEAM6) + CASE_LABEL(MSG_META_ADD_TEAM7) + CASE_LABEL(MSG_META_ADD_TEAM8) + CASE_LABEL(MSG_META_ADD_TEAM9) + CASE_LABEL(MSG_META_VIEW_TEAM0) + CASE_LABEL(MSG_META_VIEW_TEAM1) + CASE_LABEL(MSG_META_VIEW_TEAM2) + CASE_LABEL(MSG_META_VIEW_TEAM3) + CASE_LABEL(MSG_META_VIEW_TEAM4) + CASE_LABEL(MSG_META_VIEW_TEAM5) + CASE_LABEL(MSG_META_VIEW_TEAM6) + CASE_LABEL(MSG_META_VIEW_TEAM7) + CASE_LABEL(MSG_META_VIEW_TEAM8) + CASE_LABEL(MSG_META_VIEW_TEAM9) + CASE_LABEL(MSG_META_SELECT_MATCHING_UNITS) + CASE_LABEL(MSG_META_SELECT_NEXT_UNIT) + CASE_LABEL(MSG_META_SELECT_PREV_UNIT) + CASE_LABEL(MSG_META_SELECT_NEXT_WORKER) + CASE_LABEL(MSG_META_SELECT_PREV_WORKER) + CASE_LABEL(MSG_META_VIEW_COMMAND_CENTER) + CASE_LABEL(MSG_META_VIEW_LAST_RADAR_EVENT) + CASE_LABEL(MSG_META_SELECT_HERO) + CASE_LABEL(MSG_META_SELECT_ALL) + CASE_LABEL(MSG_META_SELECT_ALL_AIRCRAFT) + CASE_LABEL(MSG_META_SCATTER) + CASE_LABEL(MSG_META_STOP) + CASE_LABEL(MSG_META_DEPLOY) + CASE_LABEL(MSG_META_CREATE_FORMATION) + CASE_LABEL(MSG_META_FOLLOW) + CASE_LABEL(MSG_META_CHAT_PLAYERS) + CASE_LABEL(MSG_META_CHAT_ALLIES) + CASE_LABEL(MSG_META_CHAT_EVERYONE) + CASE_LABEL(MSG_META_DIPLOMACY) + CASE_LABEL(MSG_META_OPTIONS) #if defined(RTS_DEBUG) - CHECK_IF(MSG_META_HELP) + CASE_LABEL(MSG_META_HELP) #endif - CHECK_IF(MSG_META_TOGGLE_LOWER_DETAILS) - CHECK_IF(MSG_META_TOGGLE_CONTROL_BAR) - CHECK_IF(MSG_META_BEGIN_PATH_BUILD) - CHECK_IF(MSG_META_END_PATH_BUILD) - CHECK_IF(MSG_META_BEGIN_FORCEATTACK) - CHECK_IF(MSG_META_END_FORCEATTACK) - CHECK_IF(MSG_META_BEGIN_FORCEMOVE) - CHECK_IF(MSG_META_END_FORCEMOVE) - CHECK_IF(MSG_META_BEGIN_WAYPOINTS) - CHECK_IF(MSG_META_END_WAYPOINTS) - CHECK_IF(MSG_META_BEGIN_PREFER_SELECTION) - CHECK_IF(MSG_META_END_PREFER_SELECTION) - CHECK_IF(MSG_META_TAKE_SCREENSHOT) - CHECK_IF(MSG_META_ALL_CHEER) - CHECK_IF(MSG_META_TOGGLE_ATTACKMOVE) - CHECK_IF(MSG_META_BEGIN_CAMERA_ROTATE_LEFT) - CHECK_IF(MSG_META_END_CAMERA_ROTATE_LEFT) - CHECK_IF(MSG_META_BEGIN_CAMERA_ROTATE_RIGHT) - CHECK_IF(MSG_META_END_CAMERA_ROTATE_RIGHT) - CHECK_IF(MSG_META_BEGIN_CAMERA_ZOOM_IN) - CHECK_IF(MSG_META_END_CAMERA_ZOOM_IN) - CHECK_IF(MSG_META_BEGIN_CAMERA_ZOOM_OUT) - CHECK_IF(MSG_META_END_CAMERA_ZOOM_OUT) - CHECK_IF(MSG_META_CAMERA_RESET) - - - CHECK_IF(MSG_META_TOGGLE_FAST_FORWARD_REPLAY) - CHECK_IF(MSG_META_TOGGLE_PAUSE) - CHECK_IF(MSG_META_STEP_FRAME) + CASE_LABEL(MSG_META_TOGGLE_LOWER_DETAILS) + CASE_LABEL(MSG_META_TOGGLE_CONTROL_BAR) + CASE_LABEL(MSG_META_BEGIN_PATH_BUILD) + CASE_LABEL(MSG_META_END_PATH_BUILD) + CASE_LABEL(MSG_META_BEGIN_FORCEATTACK) + CASE_LABEL(MSG_META_END_FORCEATTACK) + CASE_LABEL(MSG_META_BEGIN_FORCEMOVE) + CASE_LABEL(MSG_META_END_FORCEMOVE) + CASE_LABEL(MSG_META_BEGIN_WAYPOINTS) + CASE_LABEL(MSG_META_END_WAYPOINTS) + CASE_LABEL(MSG_META_BEGIN_PREFER_SELECTION) + CASE_LABEL(MSG_META_END_PREFER_SELECTION) + CASE_LABEL(MSG_META_TAKE_SCREENSHOT) + CASE_LABEL(MSG_META_ALL_CHEER) + CASE_LABEL(MSG_META_TOGGLE_ATTACKMOVE) + CASE_LABEL(MSG_META_BEGIN_CAMERA_ROTATE_LEFT) + CASE_LABEL(MSG_META_END_CAMERA_ROTATE_LEFT) + CASE_LABEL(MSG_META_BEGIN_CAMERA_ROTATE_RIGHT) + CASE_LABEL(MSG_META_END_CAMERA_ROTATE_RIGHT) + CASE_LABEL(MSG_META_BEGIN_CAMERA_ZOOM_IN) + CASE_LABEL(MSG_META_END_CAMERA_ZOOM_IN) + CASE_LABEL(MSG_META_BEGIN_CAMERA_ZOOM_OUT) + CASE_LABEL(MSG_META_END_CAMERA_ZOOM_OUT) + CASE_LABEL(MSG_META_CAMERA_RESET) + + + CASE_LABEL(MSG_META_TOGGLE_FAST_FORWARD_REPLAY) + CASE_LABEL(MSG_META_TOGGLE_PAUSE) + CASE_LABEL(MSG_META_STEP_FRAME) #if defined(RTS_DEBUG) - CHECK_IF(MSG_META_DEMO_TOGGLE_BEHIND_BUILDINGS) - CHECK_IF(MSG_META_DEMO_TOGGLE_LETTERBOX) - CHECK_IF(MSG_META_DEMO_TOGGLE_MESSAGE_TEXT) - CHECK_IF(MSG_META_DEMO_LOD_DECREASE) - CHECK_IF(MSG_META_DEMO_LOD_INCREASE) - CHECK_IF(MSG_META_DEMO_TOGGLE_ZOOM_LOCK) - CHECK_IF(MSG_META_DEMO_PLAY_CAMEO_MOVIE) - CHECK_IF(MSG_META_DEMO_INSTANT_QUIT) - CHECK_IF(MSG_META_DEMO_TOGGLE_SPECIAL_POWER_DELAYS) - CHECK_IF(MSG_META_DEMO_BATTLE_CRY) - CHECK_IF(MSG_META_DEMO_SWITCH_TEAMS) - CHECK_IF(MSG_META_DEMO_SWITCH_TEAMS_BETWEEN_CHINA_USA) - CHECK_IF(MSG_META_DEMO_TOGGLE_PARTICLEDEBUG) - CHECK_IF(MSG_META_DEMO_TOGGLE_SHADOW_VOLUMES) - CHECK_IF(MSG_META_DEMO_TOGGLE_FOGOFWAR) - CHECK_IF(MSG_META_DEMO_KILL_ALL_ENEMIES) - CHECK_IF(MSG_META_DEMO_KILL_SELECTION) - CHECK_IF(MSG_META_DEMO_TOGGLE_HURT_ME_MODE) - CHECK_IF(MSG_META_DEMO_TOGGLE_HAND_OF_GOD_MODE) - CHECK_IF(MSG_META_DEMO_DEBUG_SELECTION) - CHECK_IF(MSG_META_DEMO_LOCK_CAMERA_TO_SELECTION) - CHECK_IF(MSG_META_DEMO_TOGGLE_SOUND) - CHECK_IF(MSG_META_DEMO_TOGGLE_TRACKMARKS) - CHECK_IF(MSG_META_DEMO_TOGGLE_WATERPLANE) - CHECK_IF(MSG_META_DEMO_TIME_OF_DAY) - CHECK_IF(MSG_META_DEMO_TOGGLE_MUSIC) - CHECK_IF(MSG_META_DEMO_MUSIC_NEXT_TRACK) - CHECK_IF(MSG_META_DEMO_MUSIC_PREV_TRACK) - CHECK_IF(MSG_META_DEMO_NEXT_OBJECTIVE_MOVIE) - CHECK_IF(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE1) - CHECK_IF(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE2) - CHECK_IF(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE3) - CHECK_IF(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE4) - CHECK_IF(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE5) - CHECK_IF(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE6) - CHECK_IF(MSG_META_DEMO_BEGIN_ADJUST_PITCH) - CHECK_IF(MSG_META_DEMO_END_ADJUST_PITCH) - CHECK_IF(MSG_META_DEMO_BEGIN_ADJUST_FOV) - CHECK_IF(MSG_META_DEMO_END_ADJUST_FOV) - CHECK_IF(MSG_META_DEMO_LOCK_CAMERA_TO_PLANES) - CHECK_IF(MSG_META_DEMO_REMOVE_PREREQ) - CHECK_IF(MSG_META_DEMO_INSTANT_BUILD) - CHECK_IF(MSG_META_DEMO_FREE_BUILD) - CHECK_IF(MSG_META_DEMO_RUNSCRIPT1) - CHECK_IF(MSG_META_DEMO_RUNSCRIPT2) - CHECK_IF(MSG_META_DEMO_RUNSCRIPT3) - CHECK_IF(MSG_META_DEMO_RUNSCRIPT4) - CHECK_IF(MSG_META_DEMO_RUNSCRIPT5) - CHECK_IF(MSG_META_DEMO_RUNSCRIPT6) - CHECK_IF(MSG_META_DEMO_RUNSCRIPT7) - CHECK_IF(MSG_META_DEMO_RUNSCRIPT8) - CHECK_IF(MSG_META_DEMO_RUNSCRIPT9) - CHECK_IF(MSG_META_DEMO_ENSHROUD) - CHECK_IF(MSG_META_DEMO_DESHROUD) - CHECK_IF(MSG_META_DEBUG_SHOW_EXTENTS) - CHECK_IF(MSG_META_DEBUG_SHOW_HEALTH) - CHECK_IF(MSG_META_DEBUG_GIVE_VETERANCY) - CHECK_IF(MSG_META_DEBUG_TAKE_VETERANCY) - CHECK_IF(MSG_META_DEMO_TOGGLE_AI_DEBUG) - CHECK_IF(MSG_META_DEMO_TOGGLE_CAMERA_DEBUG) - CHECK_IF(MSG_META_DEMO_TOGGLE_AVI) - CHECK_IF(MSG_META_DEMO_TOGGLE_BW_VIEW) - CHECK_IF(MSG_META_DEMO_TOGGLE_RED_VIEW) - CHECK_IF(MSG_META_DEMO_TOGGLE_GREEN_VIEW) - CHECK_IF(MSG_META_DEMO_TOGGLE_MOTION_BLUR_ZOOM) - CHECK_IF(MSG_META_DEMO_TOGGLE_MILITARY_SUBTITLES) - CHECK_IF(MSG_META_DEMO_ADD_CASH) + CASE_LABEL(MSG_META_DEMO_TOGGLE_BEHIND_BUILDINGS) + CASE_LABEL(MSG_META_DEMO_TOGGLE_LETTERBOX) + CASE_LABEL(MSG_META_DEMO_TOGGLE_MESSAGE_TEXT) + CASE_LABEL(MSG_META_DEMO_LOD_DECREASE) + CASE_LABEL(MSG_META_DEMO_LOD_INCREASE) + CASE_LABEL(MSG_META_DEMO_TOGGLE_ZOOM_LOCK) + CASE_LABEL(MSG_META_DEMO_PLAY_CAMEO_MOVIE) + CASE_LABEL(MSG_META_DEMO_INSTANT_QUIT) + CASE_LABEL(MSG_META_DEMO_TOGGLE_SPECIAL_POWER_DELAYS) + CASE_LABEL(MSG_META_DEMO_BATTLE_CRY) + CASE_LABEL(MSG_META_DEMO_SWITCH_TEAMS) + CASE_LABEL(MSG_META_DEMO_SWITCH_TEAMS_BETWEEN_CHINA_USA) + CASE_LABEL(MSG_META_DEMO_TOGGLE_PARTICLEDEBUG) + CASE_LABEL(MSG_META_DEMO_TOGGLE_SHADOW_VOLUMES) + CASE_LABEL(MSG_META_DEMO_TOGGLE_FOGOFWAR) + CASE_LABEL(MSG_META_DEMO_KILL_ALL_ENEMIES) + CASE_LABEL(MSG_META_DEMO_KILL_SELECTION) + CASE_LABEL(MSG_META_DEMO_TOGGLE_HURT_ME_MODE) + CASE_LABEL(MSG_META_DEMO_TOGGLE_HAND_OF_GOD_MODE) + CASE_LABEL(MSG_META_DEMO_DEBUG_SELECTION) + CASE_LABEL(MSG_META_DEMO_LOCK_CAMERA_TO_SELECTION) + CASE_LABEL(MSG_META_DEMO_TOGGLE_SOUND) + CASE_LABEL(MSG_META_DEMO_TOGGLE_TRACKMARKS) + CASE_LABEL(MSG_META_DEMO_TOGGLE_WATERPLANE) + CASE_LABEL(MSG_META_DEMO_TIME_OF_DAY) + CASE_LABEL(MSG_META_DEMO_TOGGLE_MUSIC) + CASE_LABEL(MSG_META_DEMO_MUSIC_NEXT_TRACK) + CASE_LABEL(MSG_META_DEMO_MUSIC_PREV_TRACK) + CASE_LABEL(MSG_META_DEMO_NEXT_OBJECTIVE_MOVIE) + CASE_LABEL(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE1) + CASE_LABEL(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE2) + CASE_LABEL(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE3) + CASE_LABEL(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE4) + CASE_LABEL(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE5) + CASE_LABEL(MSG_META_DEMO_PLAY_OBJECTIVE_MOVIE6) + CASE_LABEL(MSG_META_DEMO_BEGIN_ADJUST_PITCH) + CASE_LABEL(MSG_META_DEMO_END_ADJUST_PITCH) + CASE_LABEL(MSG_META_DEMO_BEGIN_ADJUST_FOV) + CASE_LABEL(MSG_META_DEMO_END_ADJUST_FOV) + CASE_LABEL(MSG_META_DEMO_LOCK_CAMERA_TO_PLANES) + CASE_LABEL(MSG_META_DEMO_REMOVE_PREREQ) + CASE_LABEL(MSG_META_DEMO_INSTANT_BUILD) + CASE_LABEL(MSG_META_DEMO_FREE_BUILD) + CASE_LABEL(MSG_META_DEMO_RUNSCRIPT1) + CASE_LABEL(MSG_META_DEMO_RUNSCRIPT2) + CASE_LABEL(MSG_META_DEMO_RUNSCRIPT3) + CASE_LABEL(MSG_META_DEMO_RUNSCRIPT4) + CASE_LABEL(MSG_META_DEMO_RUNSCRIPT5) + CASE_LABEL(MSG_META_DEMO_RUNSCRIPT6) + CASE_LABEL(MSG_META_DEMO_RUNSCRIPT7) + CASE_LABEL(MSG_META_DEMO_RUNSCRIPT8) + CASE_LABEL(MSG_META_DEMO_RUNSCRIPT9) + CASE_LABEL(MSG_META_DEMO_ENSHROUD) + CASE_LABEL(MSG_META_DEMO_DESHROUD) + CASE_LABEL(MSG_META_DEBUG_SHOW_EXTENTS) + CASE_LABEL(MSG_META_DEBUG_SHOW_HEALTH) + CASE_LABEL(MSG_META_DEBUG_GIVE_VETERANCY) + CASE_LABEL(MSG_META_DEBUG_TAKE_VETERANCY) + CASE_LABEL(MSG_META_DEMO_TOGGLE_AI_DEBUG) + CASE_LABEL(MSG_META_DEMO_TOGGLE_CAMERA_DEBUG) + CASE_LABEL(MSG_META_DEMO_TOGGLE_AVI) + CASE_LABEL(MSG_META_DEMO_TOGGLE_BW_VIEW) + CASE_LABEL(MSG_META_DEMO_TOGGLE_RED_VIEW) + CASE_LABEL(MSG_META_DEMO_TOGGLE_GREEN_VIEW) + CASE_LABEL(MSG_META_DEMO_TOGGLE_MOTION_BLUR_ZOOM) + CASE_LABEL(MSG_META_DEMO_TOGGLE_MILITARY_SUBTITLES) + CASE_LABEL(MSG_META_DEMO_ADD_CASH) #ifdef ALLOW_SURRENDER - CHECK_IF(MSG_META_DEMO_TEST_SURRENDER) + CASE_LABEL(MSG_META_DEMO_TEST_SURRENDER) #endif - CHECK_IF(MSG_META_DEMO_TOGGLE_RENDER) - CHECK_IF(MSG_META_DEMO_KILL_AREA_SELECTION) - CHECK_IF(MSG_META_DEMO_CYCLE_LOD_LEVEL) - CHECK_IF(MSG_META_DEBUG_INCR_ANIM_SKATE_SPEED) - CHECK_IF(MSG_META_DEBUG_DECR_ANIM_SKATE_SPEED) - CHECK_IF(MSG_META_DEBUG_CYCLE_EXTENT_TYPE) - CHECK_IF(MSG_META_DEBUG_INCREASE_EXTENT_MAJOR) - CHECK_IF(MSG_META_DEBUG_INCREASE_EXTENT_MAJOR_BIG) - CHECK_IF(MSG_META_DEBUG_DECREASE_EXTENT_MAJOR) - CHECK_IF(MSG_META_DEBUG_DECREASE_EXTENT_MAJOR_BIG) - CHECK_IF(MSG_META_DEBUG_INCREASE_EXTENT_MINOR) - CHECK_IF(MSG_META_DEBUG_INCREASE_EXTENT_MINOR_BIG) - CHECK_IF(MSG_META_DEBUG_DECREASE_EXTENT_MINOR) - CHECK_IF(MSG_META_DEBUG_DECREASE_EXTENT_MINOR_BIG) - CHECK_IF(MSG_META_DEBUG_INCREASE_EXTENT_HEIGHT) - CHECK_IF(MSG_META_DEBUG_INCREASE_EXTENT_HEIGHT_BIG) - CHECK_IF(MSG_META_DEBUG_DECREASE_EXTENT_HEIGHT) - CHECK_IF(MSG_META_DEBUG_DECREASE_EXTENT_HEIGHT_BIG) - CHECK_IF(MSG_META_DEBUG_VTUNE_ON) - CHECK_IF(MSG_META_DEBUG_VTUNE_OFF) - CHECK_IF(MSG_META_DEBUG_TOGGLE_FEATHER_WATER) - CHECK_IF(MSG_META_DEBUG_DUMP_ASSETS) - CHECK_IF(MSG_NO_DRAW) - CHECK_IF(MSG_META_DEMO_TOGGLE_METRICS) - CHECK_IF(MSG_META_DEMO_TOGGLE_PROJECTILEDEBUG) - CHECK_IF(MSG_META_DEMO_TOGGLE_VISIONDEBUG) - CHECK_IF(MSG_META_DEMO_TOGGLE_THREATDEBUG) - CHECK_IF(MSG_META_DEMO_TOGGLE_CASHMAPDEBUG) - CHECK_IF(MSG_META_DEMO_TOGGLE_GRAPHICALFRAMERATEBAR) - CHECK_IF(MSG_META_DEMO_GIVE_ALL_SCIENCES) - CHECK_IF(MSG_META_DEMO_GIVE_RANKLEVEL) - CHECK_IF(MSG_META_DEMO_TAKE_RANKLEVEL) - CHECK_IF(MSG_META_DEMO_GIVE_SCIENCEPURCHASEPOINTS) - CHECK_IF(MSG_META_DEBUG_TOGGLE_NETWORK) - CHECK_IF(MSG_META_DEBUG_DUMP_PLAYER_OBJECTS) - CHECK_IF(MSG_META_DEBUG_DUMP_ALL_PLAYER_OBJECTS) - CHECK_IF(MSG_META_DEBUG_WIN) - CHECK_IF(MSG_META_DEMO_TOGGLE_DEBUG_STATS) + CASE_LABEL(MSG_META_DEMO_TOGGLE_RENDER) + CASE_LABEL(MSG_META_DEMO_KILL_AREA_SELECTION) + CASE_LABEL(MSG_META_DEMO_CYCLE_LOD_LEVEL) + CASE_LABEL(MSG_META_DEBUG_INCR_ANIM_SKATE_SPEED) + CASE_LABEL(MSG_META_DEBUG_DECR_ANIM_SKATE_SPEED) + CASE_LABEL(MSG_META_DEBUG_CYCLE_EXTENT_TYPE) + CASE_LABEL(MSG_META_DEBUG_INCREASE_EXTENT_MAJOR) + CASE_LABEL(MSG_META_DEBUG_INCREASE_EXTENT_MAJOR_BIG) + CASE_LABEL(MSG_META_DEBUG_DECREASE_EXTENT_MAJOR) + CASE_LABEL(MSG_META_DEBUG_DECREASE_EXTENT_MAJOR_BIG) + CASE_LABEL(MSG_META_DEBUG_INCREASE_EXTENT_MINOR) + CASE_LABEL(MSG_META_DEBUG_INCREASE_EXTENT_MINOR_BIG) + CASE_LABEL(MSG_META_DEBUG_DECREASE_EXTENT_MINOR) + CASE_LABEL(MSG_META_DEBUG_DECREASE_EXTENT_MINOR_BIG) + CASE_LABEL(MSG_META_DEBUG_INCREASE_EXTENT_HEIGHT) + CASE_LABEL(MSG_META_DEBUG_INCREASE_EXTENT_HEIGHT_BIG) + CASE_LABEL(MSG_META_DEBUG_DECREASE_EXTENT_HEIGHT) + CASE_LABEL(MSG_META_DEBUG_DECREASE_EXTENT_HEIGHT_BIG) + CASE_LABEL(MSG_META_DEBUG_VTUNE_ON) + CASE_LABEL(MSG_META_DEBUG_VTUNE_OFF) + CASE_LABEL(MSG_META_DEBUG_TOGGLE_FEATHER_WATER) + CASE_LABEL(MSG_META_DEBUG_DUMP_ASSETS) + CASE_LABEL(MSG_NO_DRAW) + CASE_LABEL(MSG_META_DEMO_TOGGLE_METRICS) + CASE_LABEL(MSG_META_DEMO_TOGGLE_PROJECTILEDEBUG) + CASE_LABEL(MSG_META_DEMO_TOGGLE_VISIONDEBUG) + CASE_LABEL(MSG_META_DEMO_TOGGLE_THREATDEBUG) + CASE_LABEL(MSG_META_DEMO_TOGGLE_CASHMAPDEBUG) + CASE_LABEL(MSG_META_DEMO_TOGGLE_GRAPHICALFRAMERATEBAR) + CASE_LABEL(MSG_META_DEMO_GIVE_ALL_SCIENCES) + CASE_LABEL(MSG_META_DEMO_GIVE_RANKLEVEL) + CASE_LABEL(MSG_META_DEMO_TAKE_RANKLEVEL) + CASE_LABEL(MSG_META_DEMO_GIVE_SCIENCEPURCHASEPOINTS) + CASE_LABEL(MSG_META_DEBUG_TOGGLE_NETWORK) + CASE_LABEL(MSG_META_DEBUG_DUMP_PLAYER_OBJECTS) + CASE_LABEL(MSG_META_DEBUG_DUMP_ALL_PLAYER_OBJECTS) + CASE_LABEL(MSG_META_DEBUG_WIN) + CASE_LABEL(MSG_META_DEMO_TOGGLE_DEBUG_STATS) #endif // defined(RTS_DEBUG) #if defined(RTS_DEBUG) - CHECK_IF(MSG_META_DEMO_TOGGLE_AUDIODEBUG) + CASE_LABEL(MSG_META_DEMO_TOGGLE_AUDIODEBUG) #endif//defined(RTS_DEBUG) #ifdef DUMP_PERF_STATS - CHECK_IF(MSG_META_DEMO_PERFORM_STATISTICAL_DUMP) + CASE_LABEL(MSG_META_DEMO_PERFORM_STATISTICAL_DUMP) #endif//DUMP_PERF_STATS - CHECK_IF(MSG_META_PLACE_BEACON) - CHECK_IF(MSG_META_REMOVE_BEACON) - CHECK_IF(MSG_END_META_MESSAGES) - CHECK_IF(MSG_MOUSEOVER_DRAWABLE_HINT) - CHECK_IF(MSG_MOUSEOVER_LOCATION_HINT) - CHECK_IF(MSG_VALID_GUICOMMAND_HINT) - CHECK_IF(MSG_INVALID_GUICOMMAND_HINT) - CHECK_IF(MSG_AREA_SELECTION_HINT) - CHECK_IF(MSG_DO_ATTACK_OBJECT_HINT) - CHECK_IF(MSG_DO_ATTACK_OBJECT_AFTER_MOVING_HINT) - CHECK_IF(MSG_DO_FORCE_ATTACK_OBJECT_HINT) - CHECK_IF(MSG_DO_FORCE_ATTACK_GROUND_HINT) - CHECK_IF(MSG_GET_REPAIRED_HINT) - CHECK_IF(MSG_GET_HEALED_HINT) - CHECK_IF(MSG_DO_REPAIR_HINT) - CHECK_IF(MSG_RESUME_CONSTRUCTION_HINT) - CHECK_IF(MSG_ENTER_HINT) - CHECK_IF(MSG_DOCK_HINT) - CHECK_IF(MSG_DO_MOVETO_HINT) - CHECK_IF(MSG_DO_ATTACKMOVETO_HINT) - CHECK_IF(MSG_ADD_WAYPOINT_HINT) - CHECK_IF(MSG_HIJACK_HINT) - CHECK_IF(MSG_FIREBOMB_HINT) - CHECK_IF(MSG_CONVERT_TO_CARBOMB_HINT) - CHECK_IF(MSG_CAPTUREBUILDING_HINT) - CHECK_IF(MSG_HACK_HINT) + CASE_LABEL(MSG_META_PLACE_BEACON) + CASE_LABEL(MSG_META_REMOVE_BEACON) + CASE_LABEL(MSG_END_META_MESSAGES) + CASE_LABEL(MSG_MOUSEOVER_DRAWABLE_HINT) + CASE_LABEL(MSG_MOUSEOVER_LOCATION_HINT) + CASE_LABEL(MSG_VALID_GUICOMMAND_HINT) + CASE_LABEL(MSG_INVALID_GUICOMMAND_HINT) + CASE_LABEL(MSG_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) + CASE_LABEL(MSG_GET_HEALED_HINT) + CASE_LABEL(MSG_DO_REPAIR_HINT) + CASE_LABEL(MSG_RESUME_CONSTRUCTION_HINT) + CASE_LABEL(MSG_ENTER_HINT) + CASE_LABEL(MSG_DOCK_HINT) + CASE_LABEL(MSG_DO_MOVETO_HINT) + CASE_LABEL(MSG_DO_ATTACKMOVETO_HINT) + CASE_LABEL(MSG_ADD_WAYPOINT_HINT) + CASE_LABEL(MSG_HIJACK_HINT) + 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 - CHECK_IF(MSG_PICK_UP_PRISONER_HINT) + CASE_LABEL(MSG_PICK_UP_PRISONER_HINT) #endif - CHECK_IF(MSG_SNIPE_VEHICLE_HINT) - CHECK_IF(MSG_DEFECTOR_HINT) - CHECK_IF(MSG_SET_RALLY_POINT_HINT) - CHECK_IF(MSG_DO_SALVAGE_HINT) - CHECK_IF(MSG_DO_INVALID_HINT) - CHECK_IF(MSG_BEGIN_NETWORK_MESSAGES) - CHECK_IF(MSG_CREATE_SELECTED_GROUP) - CHECK_IF(MSG_CREATE_SELECTED_GROUP_NO_SOUND) - CHECK_IF(MSG_DESTROY_SELECTED_GROUP) - CHECK_IF(MSG_REMOVE_FROM_SELECTED_GROUP) - CHECK_IF(MSG_SELECTED_GROUP_COMMAND) - CHECK_IF(MSG_CREATE_TEAM0) - CHECK_IF(MSG_CREATE_TEAM1) - CHECK_IF(MSG_CREATE_TEAM2) - CHECK_IF(MSG_CREATE_TEAM3) - CHECK_IF(MSG_CREATE_TEAM4) - CHECK_IF(MSG_CREATE_TEAM5) - CHECK_IF(MSG_CREATE_TEAM6) - CHECK_IF(MSG_CREATE_TEAM7) - CHECK_IF(MSG_CREATE_TEAM8) - CHECK_IF(MSG_CREATE_TEAM9) - CHECK_IF(MSG_SELECT_TEAM0) - CHECK_IF(MSG_SELECT_TEAM1) - CHECK_IF(MSG_SELECT_TEAM2) - CHECK_IF(MSG_SELECT_TEAM3) - CHECK_IF(MSG_SELECT_TEAM4) - CHECK_IF(MSG_SELECT_TEAM5) - CHECK_IF(MSG_SELECT_TEAM6) - CHECK_IF(MSG_SELECT_TEAM7) - CHECK_IF(MSG_SELECT_TEAM8) - CHECK_IF(MSG_SELECT_TEAM9) - CHECK_IF(MSG_ADD_TEAM0) - CHECK_IF(MSG_ADD_TEAM1) - CHECK_IF(MSG_ADD_TEAM2) - CHECK_IF(MSG_ADD_TEAM3) - CHECK_IF(MSG_ADD_TEAM4) - CHECK_IF(MSG_ADD_TEAM5) - CHECK_IF(MSG_ADD_TEAM6) - CHECK_IF(MSG_ADD_TEAM7) - CHECK_IF(MSG_ADD_TEAM8) - CHECK_IF(MSG_ADD_TEAM9) - CHECK_IF(MSG_DO_ATTACKSQUAD) - CHECK_IF(MSG_DO_WEAPON) - CHECK_IF(MSG_DO_WEAPON_AT_LOCATION) - CHECK_IF(MSG_DO_WEAPON_AT_OBJECT) - CHECK_IF(MSG_DO_SPECIAL_POWER) - CHECK_IF(MSG_DO_SPECIAL_POWER_AT_LOCATION) - CHECK_IF(MSG_DO_SPECIAL_POWER_AT_OBJECT) - CHECK_IF(MSG_SET_RALLY_POINT) - CHECK_IF(MSG_PURCHASE_SCIENCE) - CHECK_IF(MSG_QUEUE_UPGRADE) - CHECK_IF(MSG_CANCEL_UPGRADE) - CHECK_IF(MSG_QUEUE_UNIT_CREATE) - CHECK_IF(MSG_CANCEL_UNIT_CREATE) - CHECK_IF(MSG_DOZER_CONSTRUCT) - CHECK_IF(MSG_DOZER_CONSTRUCT_LINE) - CHECK_IF(MSG_DOZER_CANCEL_CONSTRUCT) - CHECK_IF(MSG_SELL) - CHECK_IF(MSG_EXIT) - CHECK_IF(MSG_EVACUATE) - CHECK_IF(MSG_EXECUTE_RAILED_TRANSPORT) - CHECK_IF(MSG_COMBATDROP_AT_LOCATION) - CHECK_IF(MSG_COMBATDROP_AT_OBJECT) - CHECK_IF(MSG_AREA_SELECTION) - CHECK_IF(MSG_DO_ATTACK_OBJECT) - CHECK_IF(MSG_DO_FORCE_ATTACK_OBJECT) - CHECK_IF(MSG_DO_FORCE_ATTACK_GROUND) - CHECK_IF(MSG_GET_REPAIRED) - CHECK_IF(MSG_GET_HEALED) - CHECK_IF(MSG_DO_REPAIR) - CHECK_IF(MSG_RESUME_CONSTRUCTION) - CHECK_IF(MSG_ENTER) - CHECK_IF(MSG_DOCK) - CHECK_IF(MSG_DO_MOVETO) - CHECK_IF(MSG_DO_ATTACKMOVETO) - CHECK_IF(MSG_DO_FORCEMOVETO) - CHECK_IF(MSG_ADD_WAYPOINT) - CHECK_IF(MSG_DO_GUARD_POSITION) - CHECK_IF(MSG_DO_GUARD_OBJECT) - CHECK_IF(MSG_DO_STOP) - CHECK_IF(MSG_DO_SCATTER) - CHECK_IF(MSG_INTERNET_HACK) - CHECK_IF(MSG_DO_CHEER) + CASE_LABEL(MSG_SNIPE_VEHICLE_HINT) + CASE_LABEL(MSG_DEFECTOR_HINT) + CASE_LABEL(MSG_SET_RALLY_POINT_HINT) + CASE_LABEL(MSG_DO_SALVAGE_HINT) + CASE_LABEL(MSG_DO_INVALID_HINT) + CASE_LABEL(MSG_BEGIN_NETWORK_MESSAGES) + CASE_LABEL(MSG_CREATE_SELECTED_GROUP) + CASE_LABEL(MSG_CREATE_SELECTED_GROUP_NO_SOUND) + CASE_LABEL(MSG_DESTROY_SELECTED_GROUP) + CASE_LABEL(MSG_REMOVE_FROM_SELECTED_GROUP) + CASE_LABEL(MSG_SELECTED_GROUP_COMMAND) + CASE_LABEL(MSG_CREATE_TEAM0) + CASE_LABEL(MSG_CREATE_TEAM1) + CASE_LABEL(MSG_CREATE_TEAM2) + CASE_LABEL(MSG_CREATE_TEAM3) + CASE_LABEL(MSG_CREATE_TEAM4) + CASE_LABEL(MSG_CREATE_TEAM5) + CASE_LABEL(MSG_CREATE_TEAM6) + CASE_LABEL(MSG_CREATE_TEAM7) + CASE_LABEL(MSG_CREATE_TEAM8) + CASE_LABEL(MSG_CREATE_TEAM9) + CASE_LABEL(MSG_SELECT_TEAM0) + CASE_LABEL(MSG_SELECT_TEAM1) + CASE_LABEL(MSG_SELECT_TEAM2) + CASE_LABEL(MSG_SELECT_TEAM3) + CASE_LABEL(MSG_SELECT_TEAM4) + CASE_LABEL(MSG_SELECT_TEAM5) + CASE_LABEL(MSG_SELECT_TEAM6) + CASE_LABEL(MSG_SELECT_TEAM7) + CASE_LABEL(MSG_SELECT_TEAM8) + CASE_LABEL(MSG_SELECT_TEAM9) + CASE_LABEL(MSG_ADD_TEAM0) + CASE_LABEL(MSG_ADD_TEAM1) + CASE_LABEL(MSG_ADD_TEAM2) + CASE_LABEL(MSG_ADD_TEAM3) + CASE_LABEL(MSG_ADD_TEAM4) + CASE_LABEL(MSG_ADD_TEAM5) + CASE_LABEL(MSG_ADD_TEAM6) + CASE_LABEL(MSG_ADD_TEAM7) + CASE_LABEL(MSG_ADD_TEAM8) + CASE_LABEL(MSG_ADD_TEAM9) + CASE_LABEL(MSG_DO_ATTACKSQUAD) + CASE_LABEL(MSG_DO_WEAPON) + CASE_LABEL(MSG_DO_WEAPON_AT_LOCATION) + CASE_LABEL(MSG_DO_WEAPON_AT_OBJECT) + CASE_LABEL(MSG_DO_SPECIAL_POWER) + CASE_LABEL(MSG_DO_SPECIAL_POWER_AT_LOCATION) + CASE_LABEL(MSG_DO_SPECIAL_POWER_AT_OBJECT) + CASE_LABEL(MSG_SET_RALLY_POINT) + CASE_LABEL(MSG_PURCHASE_SCIENCE) + CASE_LABEL(MSG_QUEUE_UPGRADE) + CASE_LABEL(MSG_CANCEL_UPGRADE) + CASE_LABEL(MSG_QUEUE_UNIT_CREATE) + CASE_LABEL(MSG_CANCEL_UNIT_CREATE) + CASE_LABEL(MSG_DOZER_CONSTRUCT) + CASE_LABEL(MSG_DOZER_CONSTRUCT_LINE) + CASE_LABEL(MSG_DOZER_CANCEL_CONSTRUCT) + CASE_LABEL(MSG_SELL) + CASE_LABEL(MSG_EXIT) + CASE_LABEL(MSG_EVACUATE) + CASE_LABEL(MSG_EXECUTE_RAILED_TRANSPORT) + CASE_LABEL(MSG_COMBATDROP_AT_LOCATION) + CASE_LABEL(MSG_COMBATDROP_AT_OBJECT) + CASE_LABEL(MSG_AREA_SELECTION) + CASE_LABEL(MSG_DO_ATTACK_OBJECT) + CASE_LABEL(MSG_DO_FORCE_ATTACK_OBJECT) + CASE_LABEL(MSG_DO_FORCE_ATTACK_GROUND) + CASE_LABEL(MSG_GET_REPAIRED) + CASE_LABEL(MSG_GET_HEALED) + CASE_LABEL(MSG_DO_REPAIR) + CASE_LABEL(MSG_RESUME_CONSTRUCTION) + CASE_LABEL(MSG_ENTER) + CASE_LABEL(MSG_DOCK) + CASE_LABEL(MSG_DO_MOVETO) + CASE_LABEL(MSG_DO_ATTACKMOVETO) + CASE_LABEL(MSG_DO_FORCEMOVETO) + CASE_LABEL(MSG_ADD_WAYPOINT) + CASE_LABEL(MSG_DO_GUARD_POSITION) + CASE_LABEL(MSG_DO_GUARD_OBJECT) + CASE_LABEL(MSG_DO_STOP) + CASE_LABEL(MSG_DO_SCATTER) + CASE_LABEL(MSG_INTERNET_HACK) + CASE_LABEL(MSG_DO_CHEER) #ifdef ALLOW_SURRENDER - CHECK_IF(MSG_DO_SURRENDER) + CASE_LABEL(MSG_DO_SURRENDER) #endif - CHECK_IF(MSG_TOGGLE_OVERCHARGE) + CASE_LABEL(MSG_TOGGLE_OVERCHARGE) #ifdef ALLOW_SURRENDER - CHECK_IF(MSG_RETURN_TO_PRISON) + CASE_LABEL(MSG_RETURN_TO_PRISON) #endif - CHECK_IF(MSG_SWITCH_WEAPONS) - CHECK_IF(MSG_CONVERT_TO_CARBOMB) - CHECK_IF(MSG_CAPTUREBUILDING) - CHECK_IF(MSG_DISABLEVEHICLE_HACK) - CHECK_IF(MSG_STEALCASH_HACK) - CHECK_IF(MSG_DISABLEBUILDING_HACK) - CHECK_IF(MSG_SNIPE_VEHICLE) + CASE_LABEL(MSG_SWITCH_WEAPONS) + CASE_LABEL(MSG_CONVERT_TO_CARBOMB) + CASE_LABEL(MSG_CAPTUREBUILDING) + CASE_LABEL(MSG_DISABLEVEHICLE_HACK) + CASE_LABEL(MSG_STEALCASH_HACK) + CASE_LABEL(MSG_DISABLEBUILDING_HACK) + CASE_LABEL(MSG_SNIPE_VEHICLE) #ifdef ALLOW_SURRENDER - CHECK_IF(MSG_PICK_UP_PRISONER) + CASE_LABEL(MSG_PICK_UP_PRISONER) #endif - CHECK_IF(MSG_DO_SALVAGE) - CHECK_IF(MSG_CLEAR_INGAME_POPUP_MESSAGE) - CHECK_IF(MSG_PLACE_BEACON) - CHECK_IF(MSG_REMOVE_BEACON) - CHECK_IF(MSG_SET_BEACON_TEXT) - CHECK_IF(MSG_SET_REPLAY_CAMERA) - CHECK_IF(MSG_SELF_DESTRUCT) - CHECK_IF(MSG_CREATE_FORMATION) - CHECK_IF(MSG_LOGIC_CRC) + CASE_LABEL(MSG_DO_SALVAGE) + CASE_LABEL(MSG_CLEAR_INGAME_POPUP_MESSAGE) + CASE_LABEL(MSG_PLACE_BEACON) + CASE_LABEL(MSG_REMOVE_BEACON) + CASE_LABEL(MSG_SET_BEACON_TEXT) + CASE_LABEL(MSG_SET_REPLAY_CAMERA) + CASE_LABEL(MSG_SELF_DESTRUCT) + CASE_LABEL(MSG_CREATE_FORMATION) + CASE_LABEL(MSG_LOGIC_CRC) #if defined(RTS_DEBUG) - CHECK_IF(MSG_DEBUG_KILL_SELECTION) - CHECK_IF(MSG_DEBUG_HURT_OBJECT) - CHECK_IF(MSG_DEBUG_KILL_OBJECT) + CASE_LABEL(MSG_DEBUG_KILL_SELECTION) + CASE_LABEL(MSG_DEBUG_HURT_OBJECT) + CASE_LABEL(MSG_DEBUG_KILL_OBJECT) #endif - CHECK_IF(MSG_END_NETWORK_MESSAGES) - CHECK_IF(MSG_TIMESTAMP) - CHECK_IF(MSG_OBJECT_CREATED) - CHECK_IF(MSG_OBJECT_DESTROYED) - CHECK_IF(MSG_OBJECT_POSITION) - CHECK_IF(MSG_OBJECT_ORIENTATION) - CHECK_IF(MSG_OBJECT_JOINED_TEAM) - CHECK_IF(MSG_SET_MINE_CLEARING_DETAIL) + CASE_LABEL(MSG_END_NETWORK_MESSAGES) + CASE_LABEL(MSG_TIMESTAMP) + CASE_LABEL(MSG_OBJECT_CREATED) + CASE_LABEL(MSG_OBJECT_DESTROYED) + CASE_LABEL(MSG_OBJECT_POSITION) + CASE_LABEL(MSG_OBJECT_ORIENTATION) + CASE_LABEL(MSG_OBJECT_JOINED_TEAM) + CASE_LABEL(MSG_SET_MINE_CLEARING_DETAIL) return commandName; } From c0ee99fe8f78f675e0ab115f9debcddc45a727c7 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Thu, 10 Jul 2025 23:57:26 +0200 Subject: [PATCH 3/9] Added switch statement; fixed spacing. --- .../Source/Common/MessageStream.cpp | 83 +++++++++++-------- 1 file changed, 48 insertions(+), 35 deletions(-) diff --git a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp index 519e132bb6..5f02e2235d 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp @@ -230,12 +230,11 @@ AsciiString GameMessage::getCommandAsAsciiString( void ) AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) { -#define CASE_LABEL(x) if (t == x) { return #x; } - AsciiString commandName = "UnknownMessage"; - if (t >= GameMessage::MSG_COUNT) - { - commandName = "Invalid command"; - } +#define CASE_LABEL(x) case x: return #x; + + switch (t) { + default: return (t >= GameMessage::MSG_COUNT) ? "Invalid command" : "UnknownMessage"; + CASE_LABEL(MSG_INVALID) CASE_LABEL(MSG_FRAME_TICK) CASE_LABEL(MSG_RAW_MOUSE_BEGIN) @@ -342,9 +341,11 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) CASE_LABEL(MSG_META_CHAT_EVERYONE) CASE_LABEL(MSG_META_DIPLOMACY) CASE_LABEL(MSG_META_OPTIONS) + #if defined(RTS_DEBUG) CASE_LABEL(MSG_META_HELP) #endif + CASE_LABEL(MSG_META_TOGGLE_LOWER_DETAILS) CASE_LABEL(MSG_META_TOGGLE_CONTROL_BAR) CASE_LABEL(MSG_META_BEGIN_PATH_BUILD) @@ -372,34 +373,32 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) CASE_LABEL(MSG_META_TOGGLE_CAMERA_TRACKING_DRAWABLE) CASE_LABEL(MSG_META_DEMO_INSTANT_QUIT) - #if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)//may be defined in GameCommon.h - CASE_LABEL(MSG_CHEAT_RUNSCRIPT1) - CASE_LABEL(MSG_CHEAT_RUNSCRIPT2) - CASE_LABEL(MSG_CHEAT_RUNSCRIPT3) - CASE_LABEL(MSG_CHEAT_RUNSCRIPT4) - CASE_LABEL(MSG_CHEAT_RUNSCRIPT5) - CASE_LABEL(MSG_CHEAT_RUNSCRIPT6) - CASE_LABEL(MSG_CHEAT_RUNSCRIPT7) - CASE_LABEL(MSG_CHEAT_RUNSCRIPT8) - CASE_LABEL(MSG_CHEAT_RUNSCRIPT9) - CASE_LABEL(MSG_CHEAT_TOGGLE_SPECIAL_POWER_DELAYS) - CASE_LABEL(MSG_CHEAT_SWITCH_TEAMS) - CASE_LABEL(MSG_CHEAT_KILL_SELECTION) - CASE_LABEL(MSG_CHEAT_TOGGLE_HAND_OF_GOD_MODE) - CASE_LABEL(MSG_CHEAT_INSTANT_BUILD) - CASE_LABEL(MSG_CHEAT_DESHROUD) - CASE_LABEL(MSG_CHEAT_ADD_CASH) - CASE_LABEL(MSG_CHEAT_GIVE_ALL_SCIENCES) - CASE_LABEL(MSG_CHEAT_GIVE_SCIENCEPURCHASEPOINTS) - CASE_LABEL(MSG_CHEAT_SHOW_HEALTH) - CASE_LABEL(MSG_CHEAT_TOGGLE_MESSAGE_TEXT) - - + CASE_LABEL(MSG_CHEAT_RUNSCRIPT1) + CASE_LABEL(MSG_CHEAT_RUNSCRIPT2) + CASE_LABEL(MSG_CHEAT_RUNSCRIPT3) + CASE_LABEL(MSG_CHEAT_RUNSCRIPT4) + CASE_LABEL(MSG_CHEAT_RUNSCRIPT5) + CASE_LABEL(MSG_CHEAT_RUNSCRIPT6) + CASE_LABEL(MSG_CHEAT_RUNSCRIPT7) + CASE_LABEL(MSG_CHEAT_RUNSCRIPT8) + CASE_LABEL(MSG_CHEAT_RUNSCRIPT9) + CASE_LABEL(MSG_CHEAT_TOGGLE_SPECIAL_POWER_DELAYS) + CASE_LABEL(MSG_CHEAT_SWITCH_TEAMS) + CASE_LABEL(MSG_CHEAT_KILL_SELECTION) + CASE_LABEL(MSG_CHEAT_TOGGLE_HAND_OF_GOD_MODE) + CASE_LABEL(MSG_CHEAT_INSTANT_BUILD) + CASE_LABEL(MSG_CHEAT_DESHROUD) + CASE_LABEL(MSG_CHEAT_ADD_CASH) + CASE_LABEL(MSG_CHEAT_GIVE_ALL_SCIENCES) + CASE_LABEL(MSG_CHEAT_GIVE_SCIENCEPURCHASEPOINTS) + CASE_LABEL(MSG_CHEAT_SHOW_HEALTH) + 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_STEP_FRAME) + + CASE_LABEL(MSG_META_TOGGLE_FAST_FORWARD_REPLAY) + CASE_LABEL(MSG_META_TOGGLE_PAUSE) + CASE_LABEL(MSG_META_STEP_FRAME) #if defined(RTS_DEBUG) CASE_LABEL(MSG_META_DEMO_TOGGLE_BEHIND_BUILDINGS) @@ -456,7 +455,7 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) CASE_LABEL(MSG_META_DEMO_ENSHROUD) CASE_LABEL(MSG_META_DEMO_DESHROUD) CASE_LABEL(MSG_META_DEBUG_SHOW_EXTENTS) - CASE_LABEL(MSG_META_DEBUG_SHOW_AUDIO_LOCATIONS) + CASE_LABEL(MSG_META_DEBUG_SHOW_AUDIO_LOCATIONS) CASE_LABEL(MSG_META_DEBUG_SHOW_HEALTH) CASE_LABEL(MSG_META_DEBUG_GIVE_VETERANCY) CASE_LABEL(MSG_META_DEBUG_TAKE_VETERANCY) @@ -470,9 +469,11 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) CASE_LABEL(MSG_META_DEMO_TOGGLE_MOTION_BLUR_ZOOM) CASE_LABEL(MSG_META_DEMO_TOGGLE_MILITARY_SUBTITLES) CASE_LABEL(MSG_META_DEMO_ADD_CASH) + #ifdef ALLOW_SURRENDER CASE_LABEL(MSG_META_DEMO_TEST_SURRENDER) #endif + CASE_LABEL(MSG_META_DEMO_TOGGLE_RENDER) CASE_LABEL(MSG_META_DEMO_KILL_AREA_SELECTION) CASE_LABEL(MSG_META_DEMO_CYCLE_LOD_LEVEL) @@ -516,13 +517,14 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) CASE_LABEL(MSG_META_DEMO_TOGGLE_DEBUG_STATS) #endif // defined(RTS_DEBUG) - #if defined(RTS_DEBUG) CASE_LABEL(MSG_META_DEMO_TOGGLE_AUDIODEBUG) #endif//defined(RTS_DEBUG) + #ifdef DUMP_PERF_STATS CASE_LABEL(MSG_META_DEMO_PERFORM_STATISTICAL_DUMP) #endif//DUMP_PERF_STATS + CASE_LABEL(MSG_META_PLACE_BEACON) CASE_LABEL(MSG_META_REMOVE_BEACON) CASE_LABEL(MSG_END_META_MESSAGES) @@ -550,9 +552,11 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) 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) #endif + CASE_LABEL(MSG_SNIPE_VEHICLE_HINT) CASE_LABEL(MSG_DEFECTOR_HINT) CASE_LABEL(MSG_SET_RALLY_POINT_HINT) @@ -636,13 +640,17 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(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) @@ -650,9 +658,11 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(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_SALVAGE) CASE_LABEL(MSG_CLEAR_INGAME_POPUP_MESSAGE) CASE_LABEL(MSG_PLACE_BEACON) @@ -662,6 +672,7 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) CASE_LABEL(MSG_SELF_DESTRUCT) CASE_LABEL(MSG_CREATE_FORMATION) CASE_LABEL(MSG_LOGIC_CRC) + #if defined(RTS_DEBUG) CASE_LABEL(MSG_DEBUG_KILL_SELECTION) CASE_LABEL(MSG_DEBUG_HURT_OBJECT) @@ -677,7 +688,9 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) CASE_LABEL(MSG_OBJECT_JOINED_TEAM) CASE_LABEL(MSG_SET_MINE_CLEARING_DETAIL) CASE_LABEL(MSG_ENABLE_RETALIATION_MODE) - return commandName; + } + +#undef CASE_LABEL } From b0b66f715b4ca68d4a6592edc994a498bf5815f4 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Fri, 11 Jul 2025 00:05:27 +0200 Subject: [PATCH 4/9] Added switch statement; fixed spacing. --- .../Source/Common/MessageStream.cpp | 40 +++++++++++++------ 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/Generals/Code/GameEngine/Source/Common/MessageStream.cpp b/Generals/Code/GameEngine/Source/Common/MessageStream.cpp index dbc8b55714..92213674b8 100644 --- a/Generals/Code/GameEngine/Source/Common/MessageStream.cpp +++ b/Generals/Code/GameEngine/Source/Common/MessageStream.cpp @@ -230,12 +230,11 @@ AsciiString GameMessage::getCommandAsAsciiString( void ) AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) { -#define CASE_LABEL(x) if (t == x) { return #x; } - AsciiString commandName = "UnknownMessage"; - if (t >= GameMessage::MSG_COUNT) - { - commandName = "Invalid command"; - } +#define CASE_LABEL(x) case x: return #x; + + switch (t) { + default: return (t >= GameMessage::MSG_COUNT) ? "Invalid command" : "UnknownMessage"; + CASE_LABEL(MSG_INVALID) CASE_LABEL(MSG_FRAME_TICK) CASE_LABEL(MSG_RAW_MOUSE_BEGIN) @@ -342,9 +341,11 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) CASE_LABEL(MSG_META_CHAT_EVERYONE) CASE_LABEL(MSG_META_DIPLOMACY) CASE_LABEL(MSG_META_OPTIONS) + #if defined(RTS_DEBUG) CASE_LABEL(MSG_META_HELP) #endif + CASE_LABEL(MSG_META_TOGGLE_LOWER_DETAILS) CASE_LABEL(MSG_META_TOGGLE_CONTROL_BAR) CASE_LABEL(MSG_META_BEGIN_PATH_BUILD) @@ -369,11 +370,9 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) CASE_LABEL(MSG_META_BEGIN_CAMERA_ZOOM_OUT) CASE_LABEL(MSG_META_END_CAMERA_ZOOM_OUT) CASE_LABEL(MSG_META_CAMERA_RESET) - - - CASE_LABEL(MSG_META_TOGGLE_FAST_FORWARD_REPLAY) - CASE_LABEL(MSG_META_TOGGLE_PAUSE) - CASE_LABEL(MSG_META_STEP_FRAME) + CASE_LABEL(MSG_META_TOGGLE_FAST_FORWARD_REPLAY) + CASE_LABEL(MSG_META_TOGGLE_PAUSE) + CASE_LABEL(MSG_META_STEP_FRAME) #if defined(RTS_DEBUG) CASE_LABEL(MSG_META_DEMO_TOGGLE_BEHIND_BUILDINGS) @@ -443,9 +442,11 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) CASE_LABEL(MSG_META_DEMO_TOGGLE_MOTION_BLUR_ZOOM) CASE_LABEL(MSG_META_DEMO_TOGGLE_MILITARY_SUBTITLES) CASE_LABEL(MSG_META_DEMO_ADD_CASH) + #ifdef ALLOW_SURRENDER CASE_LABEL(MSG_META_DEMO_TEST_SURRENDER) #endif + CASE_LABEL(MSG_META_DEMO_TOGGLE_RENDER) CASE_LABEL(MSG_META_DEMO_KILL_AREA_SELECTION) CASE_LABEL(MSG_META_DEMO_CYCLE_LOD_LEVEL) @@ -486,13 +487,14 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) CASE_LABEL(MSG_META_DEMO_TOGGLE_DEBUG_STATS) #endif // defined(RTS_DEBUG) - #if defined(RTS_DEBUG) CASE_LABEL(MSG_META_DEMO_TOGGLE_AUDIODEBUG) #endif//defined(RTS_DEBUG) + #ifdef DUMP_PERF_STATS CASE_LABEL(MSG_META_DEMO_PERFORM_STATISTICAL_DUMP) #endif//DUMP_PERF_STATS + CASE_LABEL(MSG_META_PLACE_BEACON) CASE_LABEL(MSG_META_REMOVE_BEACON) CASE_LABEL(MSG_END_META_MESSAGES) @@ -519,9 +521,11 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) 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) #endif + CASE_LABEL(MSG_SNIPE_VEHICLE_HINT) CASE_LABEL(MSG_DEFECTOR_HINT) CASE_LABEL(MSG_SET_RALLY_POINT_HINT) @@ -605,13 +609,17 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(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) @@ -619,9 +627,11 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(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_SALVAGE) CASE_LABEL(MSG_CLEAR_INGAME_POPUP_MESSAGE) CASE_LABEL(MSG_PLACE_BEACON) @@ -631,11 +641,13 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) CASE_LABEL(MSG_SELF_DESTRUCT) CASE_LABEL(MSG_CREATE_FORMATION) CASE_LABEL(MSG_LOGIC_CRC) + #if defined(RTS_DEBUG) CASE_LABEL(MSG_DEBUG_KILL_SELECTION) CASE_LABEL(MSG_DEBUG_HURT_OBJECT) CASE_LABEL(MSG_DEBUG_KILL_OBJECT) #endif + CASE_LABEL(MSG_END_NETWORK_MESSAGES) CASE_LABEL(MSG_TIMESTAMP) CASE_LABEL(MSG_OBJECT_CREATED) @@ -644,7 +656,9 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) CASE_LABEL(MSG_OBJECT_ORIENTATION) CASE_LABEL(MSG_OBJECT_JOINED_TEAM) CASE_LABEL(MSG_SET_MINE_CLEARING_DETAIL) - return commandName; + } + +#undef CASE_LABEL } From 7528aa683a1d7e4276fa73c7f84a662d4cb05310 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Fri, 11 Jul 2025 00:05:51 +0200 Subject: [PATCH 5/9] Fixed more spacing. --- GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp index 5f02e2235d..0aa73f0105 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp @@ -673,7 +673,7 @@ AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) CASE_LABEL(MSG_CREATE_FORMATION) CASE_LABEL(MSG_LOGIC_CRC) -#if defined(RTS_DEBUG) +#if defined(RTS_DEBUG) CASE_LABEL(MSG_DEBUG_KILL_SELECTION) CASE_LABEL(MSG_DEBUG_HURT_OBJECT) CASE_LABEL(MSG_DEBUG_KILL_OBJECT) From 014c071d3c5c1722980b2db27e98900d20054009 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Mon, 14 Jul 2025 09:50:02 +0200 Subject: [PATCH 6/9] Replaced return type with 'const char*'. --- Generals/Code/GameEngine/Include/Common/MessageStream.h | 2 +- Generals/Code/GameEngine/Source/Common/MessageStream.cpp | 2 +- Generals/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp | 2 +- GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h | 2 +- GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp | 2 +- GeneralsMD/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Generals/Code/GameEngine/Include/Common/MessageStream.h b/Generals/Code/GameEngine/Include/Common/MessageStream.h index e1f28e6d37..0414fc0f34 100644 --- a/Generals/Code/GameEngine/Include/Common/MessageStream.h +++ b/Generals/Code/GameEngine/Include/Common/MessageStream.h @@ -598,7 +598,7 @@ class GameMessage : public MemoryPoolObject UnsignedByte getArgumentCount( void ) const { return m_argCount; } ///< Return the number of arguments for this msg AsciiString getCommandAsAsciiString( void ); ///< returns a string representation of the command type. - static AsciiString getCommandTypeAsAsciiString(GameMessage::Type t); + static const char* getCommandTypeAsAsciiString(GameMessage::Type t); Int getPlayerIndex( void ) const { return m_playerIndex; } ///< Return the originating player diff --git a/Generals/Code/GameEngine/Source/Common/MessageStream.cpp b/Generals/Code/GameEngine/Source/Common/MessageStream.cpp index 92213674b8..66be11ee13 100644 --- a/Generals/Code/GameEngine/Source/Common/MessageStream.cpp +++ b/Generals/Code/GameEngine/Source/Common/MessageStream.cpp @@ -228,7 +228,7 @@ AsciiString GameMessage::getCommandAsAsciiString( void ) return getCommandTypeAsAsciiString(m_type); } -AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) +const char* GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) { #define CASE_LABEL(x) case x: return #x; diff --git a/Generals/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp b/Generals/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp index 710c778aed..79f7852420 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp @@ -220,7 +220,7 @@ AsciiString NetGameCommandMsg::getContentsAsAsciiString(void) { AsciiString ret; //AsciiString tmp; - ret.format("Type:%s", GameMessage::getCommandTypeAsAsciiString((GameMessage::Type)m_type).str()); + ret.format("Type:%s", GameMessage::getCommandTypeAsAsciiString((GameMessage::Type)m_type)); return ret; } diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h b/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h index c1698320c1..4ea48d0769 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h @@ -632,7 +632,7 @@ class GameMessage : public MemoryPoolObject UnsignedByte getArgumentCount( void ) const { return m_argCount; } ///< Return the number of arguments for this msg AsciiString getCommandAsAsciiString( void ); ///< returns a string representation of the command type. - static AsciiString getCommandTypeAsAsciiString(GameMessage::Type t); + static const char* getCommandTypeAsAsciiString(GameMessage::Type t); Int getPlayerIndex( void ) const { return m_playerIndex; } ///< Return the originating player diff --git a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp index 0aa73f0105..b5228184cf 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp @@ -228,7 +228,7 @@ AsciiString GameMessage::getCommandAsAsciiString( void ) return getCommandTypeAsAsciiString(m_type); } -AsciiString GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) +const char* GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) { #define CASE_LABEL(x) case x: return #x; diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp index 00203ef992..ea9bd57339 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp @@ -220,7 +220,7 @@ AsciiString NetGameCommandMsg::getContentsAsAsciiString(void) { AsciiString ret; //AsciiString tmp; - ret.format("Type:%s", GameMessage::getCommandTypeAsAsciiString((GameMessage::Type)m_type).str()); + ret.format("Type:%s", GameMessage::getCommandTypeAsAsciiString((GameMessage::Type)m_type)); return ret; } From a337c0257661fe8b90d925a9d2c8d44f5c35c5ab Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Mon, 14 Jul 2025 09:50:49 +0200 Subject: [PATCH 7/9] Removed unused function 'getContentsAsAsciiString'. --- .../Code/GameEngine/Include/GameNetwork/NetCommandMsg.h | 6 ------ .../Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp | 9 --------- .../Code/GameEngine/Include/GameNetwork/NetCommandMsg.h | 6 ------ .../Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp | 9 --------- 4 files changed, 30 deletions(-) diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h index 9611aa76a6..089af836d0 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h @@ -56,9 +56,6 @@ class NetCommandMsg : public MemoryPoolObject void attach(); void detach(); - // For debugging purposes - virtual AsciiString getContentsAsAsciiString(void) { return AsciiString::TheEmptyString; } - protected: UnsignedInt m_timestamp; UnsignedInt m_executionFrame; @@ -86,9 +83,6 @@ class NetGameCommandMsg : public NetCommandMsg void addArgument(const GameMessageArgumentDataType type, GameMessageArgumentType arg); void setGameMessageType(GameMessage::Type type); - // For debugging purposes - virtual AsciiString getContentsAsAsciiString(void); - protected: Int m_numArgs; Int m_argSize; diff --git a/Generals/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp b/Generals/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp index 79f7852420..4489ac8d24 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp @@ -216,15 +216,6 @@ void NetGameCommandMsg::setGameMessageType(GameMessage::Type type) { m_type = type; } -AsciiString NetGameCommandMsg::getContentsAsAsciiString(void) -{ - AsciiString ret; - //AsciiString tmp; - ret.format("Type:%s", GameMessage::getCommandTypeAsAsciiString((GameMessage::Type)m_type)); - - return ret; -} - //------------------------- // NetAckBothCommandMsg //------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h index 3d6b09e083..4bccda0ca3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h @@ -56,9 +56,6 @@ class NetCommandMsg : public MemoryPoolObject void attach(); void detach(); - // For debugging purposes - virtual AsciiString getContentsAsAsciiString(void) { return AsciiString::TheEmptyString; } - protected: UnsignedInt m_timestamp; UnsignedInt m_executionFrame; @@ -86,9 +83,6 @@ class NetGameCommandMsg : public NetCommandMsg void addArgument(const GameMessageArgumentDataType type, GameMessageArgumentType arg); void setGameMessageType(GameMessage::Type type); - // For debugging purposes - virtual AsciiString getContentsAsAsciiString(void); - protected: Int m_numArgs; Int m_argSize; diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp index ea9bd57339..2cbe104e91 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/NetCommandMsg.cpp @@ -216,15 +216,6 @@ void NetGameCommandMsg::setGameMessageType(GameMessage::Type type) { m_type = type; } -AsciiString NetGameCommandMsg::getContentsAsAsciiString(void) -{ - AsciiString ret; - //AsciiString tmp; - ret.format("Type:%s", GameMessage::getCommandTypeAsAsciiString((GameMessage::Type)m_type)); - - return ret; -} - //------------------------- // NetAckBothCommandMsg //------------------------- From 64e69607769bff433658791a0db2be730fb8d9ba Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Mon, 14 Jul 2025 12:13:31 +0200 Subject: [PATCH 8/9] Updated function name. --- Generals/Code/GameEngine/Include/Common/MessageStream.h | 2 +- Generals/Code/GameEngine/Source/Common/MessageStream.cpp | 4 ++-- GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h | 2 +- GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Generals/Code/GameEngine/Include/Common/MessageStream.h b/Generals/Code/GameEngine/Include/Common/MessageStream.h index 0414fc0f34..bf9917812d 100644 --- a/Generals/Code/GameEngine/Include/Common/MessageStream.h +++ b/Generals/Code/GameEngine/Include/Common/MessageStream.h @@ -598,7 +598,7 @@ class GameMessage : public MemoryPoolObject UnsignedByte getArgumentCount( void ) const { return m_argCount; } ///< Return the number of arguments for this msg AsciiString getCommandAsAsciiString( void ); ///< returns a string representation of the command type. - static const char* getCommandTypeAsAsciiString(GameMessage::Type t); + static const char *getCommandTypeAsString(GameMessage::Type t); Int getPlayerIndex( void ) const { return m_playerIndex; } ///< Return the originating player diff --git a/Generals/Code/GameEngine/Source/Common/MessageStream.cpp b/Generals/Code/GameEngine/Source/Common/MessageStream.cpp index 66be11ee13..e06f73af25 100644 --- a/Generals/Code/GameEngine/Source/Common/MessageStream.cpp +++ b/Generals/Code/GameEngine/Source/Common/MessageStream.cpp @@ -225,10 +225,10 @@ void GameMessage::appendWideCharArgument( const WideChar& arg ) AsciiString GameMessage::getCommandAsAsciiString( void ) { - return getCommandTypeAsAsciiString(m_type); + return getCommandTypeAsString(m_type); } -const char* GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) +const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) { #define CASE_LABEL(x) case x: return #x; diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h b/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h index 4ea48d0769..a5e485a1ee 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h @@ -632,7 +632,7 @@ class GameMessage : public MemoryPoolObject UnsignedByte getArgumentCount( void ) const { return m_argCount; } ///< Return the number of arguments for this msg AsciiString getCommandAsAsciiString( void ); ///< returns a string representation of the command type. - static const char* getCommandTypeAsAsciiString(GameMessage::Type t); + static const char *getCommandTypeAsString(GameMessage::Type t); Int getPlayerIndex( void ) const { return m_playerIndex; } ///< Return the originating player diff --git a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp index b5228184cf..c55397d999 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp @@ -225,10 +225,10 @@ void GameMessage::appendWideCharArgument( const WideChar& arg ) AsciiString GameMessage::getCommandAsAsciiString( void ) { - return getCommandTypeAsAsciiString(m_type); + return getCommandTypeAsString(m_type); } -const char* GameMessage::getCommandTypeAsAsciiString(GameMessage::Type t) +const char *GameMessage::getCommandTypeAsString(GameMessage::Type t) { #define CASE_LABEL(x) case x: return #x; From 1f5362d1244e8848328ba47b8268079ad841732a Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Mon, 14 Jul 2025 12:22:13 +0200 Subject: [PATCH 9/9] Updated function 'getCommandAsAsciiString'. --- Generals/Code/GameEngine/Include/Common/MessageStream.h | 2 +- Generals/Code/GameEngine/Source/Common/MessageStream.cpp | 2 +- Generals/Code/GameEngine/Source/Common/Recorder.cpp | 4 ++-- .../Code/GameEngine/Source/GameClient/GameClientDispatch.cpp | 2 +- .../GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp | 2 +- Generals/Code/GameEngine/Source/GameNetwork/Network.cpp | 2 +- GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h | 2 +- GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp | 2 +- GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp | 4 ++-- .../Code/GameEngine/Source/GameClient/GameClientDispatch.cpp | 2 +- .../GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp | 2 +- GeneralsMD/Code/GameEngine/Source/GameNetwork/Network.cpp | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Generals/Code/GameEngine/Include/Common/MessageStream.h b/Generals/Code/GameEngine/Include/Common/MessageStream.h index bf9917812d..04f9c3c956 100644 --- a/Generals/Code/GameEngine/Include/Common/MessageStream.h +++ b/Generals/Code/GameEngine/Include/Common/MessageStream.h @@ -597,7 +597,7 @@ class GameMessage : public MemoryPoolObject Type getType( void ) const { return m_type; } ///< Return the message type UnsignedByte getArgumentCount( void ) const { return m_argCount; } ///< Return the number of arguments for this msg - AsciiString getCommandAsAsciiString( void ); ///< returns a string representation of the command type. + const char *getCommandAsString( void ) const; ///< returns a string representation of the command type. static const char *getCommandTypeAsString(GameMessage::Type t); Int getPlayerIndex( void ) const { return m_playerIndex; } ///< Return the originating player diff --git a/Generals/Code/GameEngine/Source/Common/MessageStream.cpp b/Generals/Code/GameEngine/Source/Common/MessageStream.cpp index e06f73af25..be70595166 100644 --- a/Generals/Code/GameEngine/Source/Common/MessageStream.cpp +++ b/Generals/Code/GameEngine/Source/Common/MessageStream.cpp @@ -223,7 +223,7 @@ void GameMessage::appendWideCharArgument( const WideChar& arg ) a->m_type = ARGUMENTDATATYPE_WIDECHAR; } -AsciiString GameMessage::getCommandAsAsciiString( void ) +const char *GameMessage::getCommandAsString( void ) const { return getCommandTypeAsString(m_type); } diff --git a/Generals/Code/GameEngine/Source/Common/Recorder.cpp b/Generals/Code/GameEngine/Source/Common/Recorder.cpp index ca0b7ca5fd..02c4766b5c 100644 --- a/Generals/Code/GameEngine/Source/Common/Recorder.cpp +++ b/Generals/Code/GameEngine/Source/Common/Recorder.cpp @@ -742,7 +742,7 @@ void RecorderClass::writeToFile(GameMessage * msg) { fwrite(&playerIndex, sizeof(playerIndex), 1, m_file); #ifdef DEBUG_LOGGING - AsciiString commandName = msg->getCommandAsAsciiString(); + AsciiString commandName = msg->getCommandAsString(); if (type < GameMessage::MSG_BEGIN_NETWORK_MESSAGES || type > GameMessage::MSG_END_NETWORK_MESSAGES) { commandName.concat(" (Non-Network message!)"); @@ -1330,7 +1330,7 @@ void RecorderClass::appendNextCommand() { GameMessage *msg = newInstance(GameMessage)(type); #ifdef DEBUG_LOGGING - AsciiString commandName = msg->getCommandAsAsciiString(); + AsciiString commandName = msg->getCommandAsString(); if (type < GameMessage::MSG_BEGIN_NETWORK_MESSAGES || type > GameMessage::MSG_END_NETWORK_MESSAGES) { commandName.concat(" (Non-Network message!)"); diff --git a/Generals/Code/GameEngine/Source/GameClient/GameClientDispatch.cpp b/Generals/Code/GameEngine/Source/GameClient/GameClientDispatch.cpp index e8b8a8aa82..758937345e 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GameClientDispatch.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GameClientDispatch.cpp @@ -50,7 +50,7 @@ GameMessageDisposition GameClientMessageDispatcher::translateGameMessage(const G return KEEP_MESSAGE; //DEBUG_LOG(("GameClientMessageDispatcher::translateGameMessage() - eating a %s on frame %d\n", - //((GameMessage *)msg)->getCommandAsAsciiString().str(), TheGameClient->getFrame())); + //((GameMessage *)msg)->getCommandAsString(), TheGameClient->getFrame())); return DESTROY_MESSAGE; } // end clientMessageDispatcher diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp index 8b6c56b855..17dea0b451 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp @@ -387,7 +387,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData ) #ifdef DEBUG_LOGGING AsciiString commandName; - commandName = msg->getCommandAsAsciiString(); + commandName = msg->getCommandAsString(); if (msg->getType() < GameMessage::MSG_BEGIN_NETWORK_MESSAGES || msg->getType() > GameMessage::MSG_END_NETWORK_MESSAGES) { commandName.concat(" (NON-LOGIC-MESSAGE!!!)"); diff --git a/Generals/Code/GameEngine/Source/GameNetwork/Network.cpp b/Generals/Code/GameEngine/Source/GameNetwork/Network.cpp index 2f499ff032..f4fa376538 100644 --- a/Generals/Code/GameEngine/Source/GameNetwork/Network.cpp +++ b/Generals/Code/GameEngine/Source/GameNetwork/Network.cpp @@ -588,7 +588,7 @@ void Network::RelayCommandsToCommandList(UnsignedInt frame) { while (msg != NULL) { NetCommandType cmdType = msg->getCommand()->getNetCommandType(); if (cmdType == NETCOMMANDTYPE_GAMECOMMAND) { - //DEBUG_LOG(("Network::RelayCommandsToCommandList - appending command %d of type %s to command list on frame %d\n", msg->getCommand()->getID(), ((NetGameCommandMsg *)msg->getCommand())->constructGameMessage()->getCommandAsAsciiString().str(), TheGameLogic->getFrame())); + //DEBUG_LOG(("Network::RelayCommandsToCommandList - appending command %d of type %s to command list on frame %d\n", msg->getCommand()->getID(), ((NetGameCommandMsg *)msg->getCommand())->constructGameMessage()->getCommandAsString(), TheGameLogic->getFrame())); TheCommandList->appendMessage(((NetGameCommandMsg *)msg->getCommand())->constructGameMessage()); } else { processFrameSynchronizedNetCommand(msg); diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h b/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h index a5e485a1ee..6f17c3b366 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h @@ -631,7 +631,7 @@ class GameMessage : public MemoryPoolObject Type getType( void ) const { return m_type; } ///< Return the message type UnsignedByte getArgumentCount( void ) const { return m_argCount; } ///< Return the number of arguments for this msg - AsciiString getCommandAsAsciiString( void ); ///< returns a string representation of the command type. + const char *getCommandAsString( void ) const; ///< returns a string representation of the command type. static const char *getCommandTypeAsString(GameMessage::Type t); Int getPlayerIndex( void ) const { return m_playerIndex; } ///< Return the originating player diff --git a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp index c55397d999..2ec49b22b4 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp @@ -223,7 +223,7 @@ void GameMessage::appendWideCharArgument( const WideChar& arg ) a->m_type = ARGUMENTDATATYPE_WIDECHAR; } -AsciiString GameMessage::getCommandAsAsciiString( void ) +const char *GameMessage::getCommandAsString( void ) const { return getCommandTypeAsString(m_type); } diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp index 7578c2f8e5..e81534429f 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp @@ -744,7 +744,7 @@ void RecorderClass::writeToFile(GameMessage * msg) { fwrite(&playerIndex, sizeof(playerIndex), 1, m_file); #ifdef DEBUG_LOGGING - AsciiString commandName = msg->getCommandAsAsciiString(); + AsciiString commandName = msg->getCommandAsString(); if (type < GameMessage::MSG_BEGIN_NETWORK_MESSAGES || type > GameMessage::MSG_END_NETWORK_MESSAGES) { commandName.concat(" (Non-Network message!)"); @@ -1333,7 +1333,7 @@ void RecorderClass::appendNextCommand() { GameMessage *msg = newInstance(GameMessage)(type); #ifdef DEBUG_LOGGING - AsciiString commandName = msg->getCommandAsAsciiString(); + AsciiString commandName = msg->getCommandAsString(); if (type < GameMessage::MSG_BEGIN_NETWORK_MESSAGES || type > GameMessage::MSG_END_NETWORK_MESSAGES) { commandName.concat(" (Non-Network message!)"); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GameClientDispatch.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GameClientDispatch.cpp index e2e1c78244..f52a451461 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GameClientDispatch.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GameClientDispatch.cpp @@ -50,7 +50,7 @@ GameMessageDisposition GameClientMessageDispatcher::translateGameMessage(const G return KEEP_MESSAGE; //DEBUG_LOG(("GameClientMessageDispatcher::translateGameMessage() - eating a %s on frame %d\n", - //((GameMessage *)msg)->getCommandAsAsciiString().str(), TheGameClient->getFrame())); + //((GameMessage *)msg)->getCommandAsString(), TheGameClient->getFrame())); return DESTROY_MESSAGE; } // end clientMessageDispatcher diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp index 7c51aba5b2..520addf8f1 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp @@ -396,7 +396,7 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData ) #ifdef DEBUG_LOGGING AsciiString commandName; - commandName = msg->getCommandAsAsciiString(); + commandName = msg->getCommandAsString(); if (msg->getType() < GameMessage::MSG_BEGIN_NETWORK_MESSAGES || msg->getType() > GameMessage::MSG_END_NETWORK_MESSAGES) { commandName.concat(" (NON-LOGIC-MESSAGE!!!)"); diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/Network.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/Network.cpp index b24f5e7c46..d844ab2773 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/Network.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/Network.cpp @@ -588,7 +588,7 @@ void Network::RelayCommandsToCommandList(UnsignedInt frame) { while (msg != NULL) { NetCommandType cmdType = msg->getCommand()->getNetCommandType(); if (cmdType == NETCOMMANDTYPE_GAMECOMMAND) { - //DEBUG_LOG(("Network::RelayCommandsToCommandList - appending command %d of type %s to command list on frame %d\n", msg->getCommand()->getID(), ((NetGameCommandMsg *)msg->getCommand())->constructGameMessage()->getCommandAsAsciiString().str(), TheGameLogic->getFrame())); + //DEBUG_LOG(("Network::RelayCommandsToCommandList - appending command %d of type %s to command list on frame %d\n", msg->getCommand()->getID(), ((NetGameCommandMsg *)msg->getCommand())->constructGameMessage()->getCommandAsString(), TheGameLogic->getFrame())); TheCommandList->appendMessage(((NetGameCommandMsg *)msg->getCommand())->constructGameMessage()); } else { processFrameSynchronizedNetCommand(msg);