[GEN][ZH] Enable Control Bar toggle for Replay playback and match observers (#854)

Mauller · Bart Roossien · web-flow · commit 81096141a759 · 2025-07-12T17:16:27.000+02:00
Co-authored-by: Bart Roossien &lt;bart.roossien@energygo.nl&gt;
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp
@@ -2982,8 +2982,6 @@ void ControlBar::switchControlBarStage( ControlBarStages stage )
 {
 	if(stage < CONTROL_BAR_STAGE_DEFAULT || stage >= MAX_CONTROL_BAR_STAGES)
 		return;
-	if (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK)
-		return;
 	switch (stage) {
 	case CONTROL_BAR_STAGE_DEFAULT:
 		setDefaultControlBarConfig();
diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp
@@ -3033,20 +3033,17 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			}
 			else
 			{
-				if (!(TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK))
+				Bool hide = false;
+				if (TheWindowManager)
 				{
-					Bool hide = false;
-					if (TheWindowManager)
-					{
-						Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent"));
-						GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);
-
-						if (window)
-							hide = !window->winIsHidden();
-					}
+					Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent"));
+					GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);
 
-					ToggleControlBar();
+					if (window)
+						hide = !window->winIsHidden();
 				}
+
+				ToggleControlBar();
 			}
 			disp = DESTROY_MESSAGE;
 			break;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp
@@ -3005,8 +3005,6 @@ void ControlBar::switchControlBarStage( ControlBarStages stage )
 {
 	if(stage < CONTROL_BAR_STAGE_DEFAULT || stage >= MAX_CONTROL_BAR_STAGES)
 		return;
-	if (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK)
-		return;
 	switch (stage) {
 	case CONTROL_BAR_STAGE_DEFAULT:
 		setDefaultControlBarConfig();
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp
@@ -3179,20 +3179,17 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			}
 			else
 			{
-				if (!(TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK))
+				Bool hide = false;
+				if (TheWindowManager)
 				{
-					Bool hide = false;
-					if (TheWindowManager)
-					{
-						Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent"));
-						GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);
-
-						if (window)
-							hide = !window->winIsHidden();
-					}
+					Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent"));
+					GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);
 
-					ToggleControlBar();
+					if (window)
+						hide = !window->winIsHidden();
 				}
+
+				ToggleControlBar();
 			}
 			disp = DESTROY_MESSAGE;
 			break;

Original file line number	Diff line number	Diff line change
`@@ -2982,8 +2982,6 @@ void ControlBar::switchControlBarStage( ControlBarStages stage )`
`2982`	`2982`	`{`
`2983`	`2983`	`if(stage < CONTROL_BAR_STAGE_DEFAULT \|\| stage >= MAX_CONTROL_BAR_STAGES)`
`2984`	`2984`	`return;`
`2985`		`- if (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK)`
`2986`		`- return;`
`2987`	`2985`	`switch (stage) {`
`2988`	`2986`	`case CONTROL_BAR_STAGE_DEFAULT:`
`2989`	`2987`	`setDefaultControlBarConfig();`
Original file line number	Diff line number	Diff line change
`@@ -3033,20 +3033,17 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage`
`3033`	`3033`	`}`
`3034`	`3034`	`else`
`3035`	`3035`	`{`
`3036`		`- if (!(TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK))`
	`3036`	`+ Bool hide = false;`
	`3037`	`+ if (TheWindowManager)`
`3037`	`3038`	`{`
`3038`		`- Bool hide = false;`
`3039`		`- if (TheWindowManager)`
`3040`		`- {`
`3041`		`- Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent"));`
`3042`		`- GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);`
`3043`		`-`
`3044`		`- if (window)`
`3045`		`- hide = !window->winIsHidden();`
`3046`		`- }`
	`3039`	`+ Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent"));`
	`3040`	`+ GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);`
`3047`	`3041`
`3048`		`- ToggleControlBar();`
	`3042`	`+ if (window)`
	`3043`	`+ hide = !window->winIsHidden();`
`3049`	`3044`	`}`
	`3045`	`+`
	`3046`	`+ ToggleControlBar();`
`3050`	`3047`	`}`
`3051`	`3048`	`disp = DESTROY_MESSAGE;`
`3052`	`3049`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -3005,8 +3005,6 @@ void ControlBar::switchControlBarStage( ControlBarStages stage )`
`3005`	`3005`	`{`
`3006`	`3006`	`if(stage < CONTROL_BAR_STAGE_DEFAULT \|\| stage >= MAX_CONTROL_BAR_STAGES)`
`3007`	`3007`	`return;`
`3008`		`- if (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK)`
`3009`		`- return;`
`3010`	`3008`	`switch (stage) {`
`3011`	`3009`	`case CONTROL_BAR_STAGE_DEFAULT:`
`3012`	`3010`	`setDefaultControlBarConfig();`
Original file line number	Diff line number	Diff line change
`@@ -3179,20 +3179,17 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage`
`3179`	`3179`	`}`
`3180`	`3180`	`else`
`3181`	`3181`	`{`
`3182`		`- if (!(TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_PLAYBACK))`
	`3182`	`+ Bool hide = false;`
	`3183`	`+ if (TheWindowManager)`
`3183`	`3184`	`{`
`3184`		`- Bool hide = false;`
`3185`		`- if (TheWindowManager)`
`3186`		`- {`
`3187`		`- Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent"));`
`3188`		`- GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);`
`3189`		`-`
`3190`		`- if (window)`
`3191`		`- hide = !window->winIsHidden();`
`3192`		`- }`
	`3185`	`+ Int id = (Int)TheNameKeyGenerator->nameToKey(AsciiString("ControlBar.wnd:ControlBarParent"));`
	`3186`	`+ GameWindow *window = TheWindowManager->winGetWindowFromId(NULL, id);`
`3193`	`3187`
`3194`		`- ToggleControlBar();`
	`3188`	`+ if (window)`
	`3189`	`+ hide = !window->winIsHidden();`
`3195`	`3190`	`}`
	`3191`	`+`
	`3192`	`+ ToggleControlBar();`
`3196`	`3193`	`}`
`3197`	`3194`	`disp = DESTROY_MESSAGE;`
`3198`	`3195`	`break;`