Skip to content

Commit c8b5f61

Browse files
Caball009Caball009
authored
chore(gamemessage): Clean up GameMessage::getCommandTypeAsString (TheSuperHackers#2695)
1 parent e887d02 commit c8b5f61

2 files changed

Lines changed: 38 additions & 49 deletions

File tree

‎Generals/Code/GameEngine/Source/Common/MessageStream.cpp‎

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -500,11 +500,11 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
500500

501501
#if defined(RTS_DEBUG)
502502
CASE_LABEL(MSG_META_DEMO_TOGGLE_AUDIODEBUG)
503-
#endif//defined(RTS_DEBUG)
503+
#endif
504504

505505
#ifdef DUMP_PERF_STATS
506506
CASE_LABEL(MSG_META_DEMO_PERFORM_STATISTICAL_DUMP)
507-
#endif//DUMP_PERF_STATS
507+
#endif
508508

509509
CASE_LABEL(MSG_META_PLACE_BEACON)
510510
CASE_LABEL(MSG_META_REMOVE_BEACON)
@@ -516,7 +516,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
516516
CASE_LABEL(MSG_BEGIN_AREA_SELECTION_HINT)
517517
CASE_LABEL(MSG_END_AREA_SELECTION_HINT)
518518
CASE_LABEL(MSG_DO_ATTACK_OBJECT_HINT)
519-
CASE_LABEL(MSG_DO_ATTACK_OBJECT_AFTER_MOVING_HINT)
519+
CASE_LABEL(MSG_IMPOSSIBLE_ATTACK_HINT)
520520
CASE_LABEL(MSG_DO_FORCE_ATTACK_OBJECT_HINT)
521521
CASE_LABEL(MSG_DO_FORCE_ATTACK_GROUND_HINT)
522522
CASE_LABEL(MSG_GET_REPAIRED_HINT)
@@ -532,7 +532,6 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
532532
CASE_LABEL(MSG_FIREBOMB_HINT)
533533
CASE_LABEL(MSG_CONVERT_TO_CARBOMB_HINT)
534534
CASE_LABEL(MSG_CAPTUREBUILDING_HINT)
535-
CASE_LABEL(MSG_HACK_HINT)
536535

537536
#ifdef ALLOW_SURRENDER
538537
CASE_LABEL(MSG_PICK_UP_PRISONER_HINT)
@@ -541,8 +540,11 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
541540
CASE_LABEL(MSG_SNIPE_VEHICLE_HINT)
542541
CASE_LABEL(MSG_DEFECTOR_HINT)
543542
CASE_LABEL(MSG_SET_RALLY_POINT_HINT)
543+
CASE_LABEL(MSG_DO_SPECIAL_POWER_OVERRIDE_DESTINATION_HINT)
544544
CASE_LABEL(MSG_DO_SALVAGE_HINT)
545545
CASE_LABEL(MSG_DO_INVALID_HINT)
546+
CASE_LABEL(MSG_DO_ATTACK_OBJECT_AFTER_MOVING_HINT)
547+
CASE_LABEL(MSG_HACK_HINT)
546548
CASE_LABEL(MSG_BEGIN_NETWORK_MESSAGES)
547549
CASE_LABEL(MSG_CREATE_SELECTED_GROUP)
548550
CASE_LABEL(MSG_CREATE_SELECTED_GROUP_NO_SOUND)
@@ -621,29 +623,15 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
621623
CASE_LABEL(MSG_DO_SCATTER)
622624
CASE_LABEL(MSG_INTERNET_HACK)
623625
CASE_LABEL(MSG_DO_CHEER)
624-
625-
#ifdef ALLOW_SURRENDER
626-
CASE_LABEL(MSG_DO_SURRENDER)
627-
#endif
628-
629626
CASE_LABEL(MSG_TOGGLE_OVERCHARGE)
630-
631-
#ifdef ALLOW_SURRENDER
632-
CASE_LABEL(MSG_RETURN_TO_PRISON)
633-
#endif
634-
635627
CASE_LABEL(MSG_SWITCH_WEAPONS)
636628
CASE_LABEL(MSG_CONVERT_TO_CARBOMB)
637629
CASE_LABEL(MSG_CAPTUREBUILDING)
638630
CASE_LABEL(MSG_DISABLEVEHICLE_HACK)
639631
CASE_LABEL(MSG_STEALCASH_HACK)
640632
CASE_LABEL(MSG_DISABLEBUILDING_HACK)
641633
CASE_LABEL(MSG_SNIPE_VEHICLE)
642-
643-
#ifdef ALLOW_SURRENDER
644-
CASE_LABEL(MSG_PICK_UP_PRISONER)
645-
#endif
646-
634+
CASE_LABEL(MSG_DO_SPECIAL_POWER_OVERRIDE_DESTINATION)
647635
CASE_LABEL(MSG_DO_SALVAGE)
648636
CASE_LABEL(MSG_CLEAR_INGAME_POPUP_MESSAGE)
649637
CASE_LABEL(MSG_PLACE_BEACON)
@@ -653,6 +641,8 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
653641
CASE_LABEL(MSG_SELF_DESTRUCT)
654642
CASE_LABEL(MSG_CREATE_FORMATION)
655643
CASE_LABEL(MSG_LOGIC_CRC)
644+
CASE_LABEL(MSG_SET_MINE_CLEARING_DETAIL)
645+
CASE_LABEL(MSG_BEGIN_DEBUG_NETWORK_MESSAGES)
656646

657647
#if defined(RTS_DEBUG)
658648
CASE_LABEL(MSG_DEBUG_KILL_SELECTION)
@@ -667,7 +657,12 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
667657
CASE_LABEL(MSG_OBJECT_POSITION)
668658
CASE_LABEL(MSG_OBJECT_ORIENTATION)
669659
CASE_LABEL(MSG_OBJECT_JOINED_TEAM)
670-
CASE_LABEL(MSG_SET_MINE_CLEARING_DETAIL)
660+
661+
#ifdef ALLOW_SURRENDER
662+
CASE_LABEL(MSG_DO_SURRENDER)
663+
CASE_LABEL(MSG_RETURN_TO_PRISON)
664+
CASE_LABEL(MSG_PICK_UP_PRISONER)
665+
#endif
671666
}
672667

673668
#undef CASE_LABEL

‎GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp‎

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -378,9 +378,14 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
378378
CASE_LABEL(MSG_META_END_CAMERA_ZOOM_OUT)
379379
CASE_LABEL(MSG_META_CAMERA_RESET)
380380
CASE_LABEL(MSG_META_TOGGLE_CAMERA_TRACKING_DRAWABLE)
381+
CASE_LABEL(MSG_META_TOGGLE_FAST_FORWARD_REPLAY)
382+
CASE_LABEL(MSG_META_TOGGLE_PAUSE)
383+
CASE_LABEL(MSG_META_TOGGLE_PAUSE_ALT)
384+
CASE_LABEL(MSG_META_STEP_FRAME)
385+
CASE_LABEL(MSG_META_STEP_FRAME_ALT)
381386
CASE_LABEL(MSG_META_DEMO_INSTANT_QUIT)
382387

383-
#if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)//may be defined in GameCommon.h
388+
#if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
384389
CASE_LABEL(MSG_CHEAT_RUNSCRIPT1)
385390
CASE_LABEL(MSG_CHEAT_RUNSCRIPT2)
386391
CASE_LABEL(MSG_CHEAT_RUNSCRIPT3)
@@ -403,12 +408,6 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
403408
CASE_LABEL(MSG_CHEAT_TOGGLE_MESSAGE_TEXT)
404409
#endif
405410

406-
CASE_LABEL(MSG_META_TOGGLE_FAST_FORWARD_REPLAY)
407-
CASE_LABEL(MSG_META_TOGGLE_PAUSE)
408-
CASE_LABEL(MSG_META_TOGGLE_PAUSE_ALT)
409-
CASE_LABEL(MSG_META_STEP_FRAME)
410-
CASE_LABEL(MSG_META_STEP_FRAME_ALT)
411-
412411
#if defined(RTS_DEBUG)
413412
CASE_LABEL(MSG_META_DEMO_TOGGLE_BEHIND_BUILDINGS)
414413
CASE_LABEL(MSG_META_DEMO_TOGGLE_LETTERBOX)
@@ -530,11 +529,11 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
530529

531530
#if defined(RTS_DEBUG)
532531
CASE_LABEL(MSG_META_DEMO_TOGGLE_AUDIODEBUG)
533-
#endif//defined(RTS_DEBUG)
532+
#endif
534533

535534
#ifdef DUMP_PERF_STATS
536535
CASE_LABEL(MSG_META_DEMO_PERFORM_STATISTICAL_DUMP)
537-
#endif//DUMP_PERF_STATS
536+
#endif
538537

539538
CASE_LABEL(MSG_META_PLACE_BEACON)
540539
CASE_LABEL(MSG_META_REMOVE_BEACON)
@@ -546,7 +545,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
546545
CASE_LABEL(MSG_BEGIN_AREA_SELECTION_HINT)
547546
CASE_LABEL(MSG_END_AREA_SELECTION_HINT)
548547
CASE_LABEL(MSG_DO_ATTACK_OBJECT_HINT)
549-
CASE_LABEL(MSG_DO_ATTACK_OBJECT_AFTER_MOVING_HINT)
548+
CASE_LABEL(MSG_IMPOSSIBLE_ATTACK_HINT)
550549
CASE_LABEL(MSG_DO_FORCE_ATTACK_OBJECT_HINT)
551550
CASE_LABEL(MSG_DO_FORCE_ATTACK_GROUND_HINT)
552551
CASE_LABEL(MSG_GET_REPAIRED_HINT)
@@ -563,7 +562,6 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
563562
CASE_LABEL(MSG_FIREBOMB_HINT)
564563
CASE_LABEL(MSG_CONVERT_TO_CARBOMB_HINT)
565564
CASE_LABEL(MSG_CAPTUREBUILDING_HINT)
566-
CASE_LABEL(MSG_HACK_HINT)
567565

568566
#ifdef ALLOW_SURRENDER
569567
CASE_LABEL(MSG_PICK_UP_PRISONER_HINT)
@@ -572,8 +570,11 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
572570
CASE_LABEL(MSG_SNIPE_VEHICLE_HINT)
573571
CASE_LABEL(MSG_DEFECTOR_HINT)
574572
CASE_LABEL(MSG_SET_RALLY_POINT_HINT)
573+
CASE_LABEL(MSG_DO_SPECIAL_POWER_OVERRIDE_DESTINATION_HINT)
575574
CASE_LABEL(MSG_DO_SALVAGE_HINT)
576575
CASE_LABEL(MSG_DO_INVALID_HINT)
576+
CASE_LABEL(MSG_DO_ATTACK_OBJECT_AFTER_MOVING_HINT)
577+
CASE_LABEL(MSG_HACK_HINT)
577578
CASE_LABEL(MSG_BEGIN_NETWORK_MESSAGES)
578579
CASE_LABEL(MSG_CREATE_SELECTED_GROUP)
579580
CASE_LABEL(MSG_CREATE_SELECTED_GROUP_NO_SOUND)
@@ -652,29 +653,15 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
652653
CASE_LABEL(MSG_DO_SCATTER)
653654
CASE_LABEL(MSG_INTERNET_HACK)
654655
CASE_LABEL(MSG_DO_CHEER)
655-
656-
#ifdef ALLOW_SURRENDER
657-
CASE_LABEL(MSG_DO_SURRENDER)
658-
#endif
659-
660656
CASE_LABEL(MSG_TOGGLE_OVERCHARGE)
661-
662-
#ifdef ALLOW_SURRENDER
663-
CASE_LABEL(MSG_RETURN_TO_PRISON)
664-
#endif
665-
666657
CASE_LABEL(MSG_SWITCH_WEAPONS)
667658
CASE_LABEL(MSG_CONVERT_TO_CARBOMB)
668659
CASE_LABEL(MSG_CAPTUREBUILDING)
669660
CASE_LABEL(MSG_DISABLEVEHICLE_HACK)
670661
CASE_LABEL(MSG_STEALCASH_HACK)
671662
CASE_LABEL(MSG_DISABLEBUILDING_HACK)
672663
CASE_LABEL(MSG_SNIPE_VEHICLE)
673-
674-
#ifdef ALLOW_SURRENDER
675-
CASE_LABEL(MSG_PICK_UP_PRISONER)
676-
#endif
677-
664+
CASE_LABEL(MSG_DO_SPECIAL_POWER_OVERRIDE_DESTINATION)
678665
CASE_LABEL(MSG_DO_SALVAGE)
679666
CASE_LABEL(MSG_CLEAR_INGAME_POPUP_MESSAGE)
680667
CASE_LABEL(MSG_PLACE_BEACON)
@@ -684,8 +671,11 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
684671
CASE_LABEL(MSG_SELF_DESTRUCT)
685672
CASE_LABEL(MSG_CREATE_FORMATION)
686673
CASE_LABEL(MSG_LOGIC_CRC)
674+
CASE_LABEL(MSG_SET_MINE_CLEARING_DETAIL)
675+
CASE_LABEL(MSG_ENABLE_RETALIATION_MODE)
676+
CASE_LABEL(MSG_BEGIN_DEBUG_NETWORK_MESSAGES)
687677

688-
#if defined(RTS_DEBUG)
678+
#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
689679
CASE_LABEL(MSG_DEBUG_KILL_SELECTION)
690680
CASE_LABEL(MSG_DEBUG_HURT_OBJECT)
691681
CASE_LABEL(MSG_DEBUG_KILL_OBJECT)
@@ -698,8 +688,12 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
698688
CASE_LABEL(MSG_OBJECT_POSITION)
699689
CASE_LABEL(MSG_OBJECT_ORIENTATION)
700690
CASE_LABEL(MSG_OBJECT_JOINED_TEAM)
701-
CASE_LABEL(MSG_SET_MINE_CLEARING_DETAIL)
702-
CASE_LABEL(MSG_ENABLE_RETALIATION_MODE)
691+
692+
#ifdef ALLOW_SURRENDER
693+
CASE_LABEL(MSG_DO_SURRENDER)
694+
CASE_LABEL(MSG_RETURN_TO_PRISON)
695+
CASE_LABEL(MSG_PICK_UP_PRISONER)
696+
#endif
703697
}
704698

705699
#undef CASE_LABEL

0 commit comments

Comments
 (0)