feat: Observers can now select the next idle worker of the currently viewed player

Stubbjax · Stubbjax · commit 3ed92d462458 · 2025-09-13T11:36:50.000+10:00
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp
@@ -89,6 +89,7 @@ static NameKeyType buttonCancelID = NAMEKEY_INVALID;
 
 static GameWindow *winFlag = NULL;
 static GameWindow *winGeneralPortrait = NULL;
+static GameWindow *buttonIdleWorker = NULL;
 static GameWindow *staticTextNumberOfUnits = NULL;
 static GameWindow *staticTextNumberOfBuildings = NULL;
 static GameWindow *staticTextNumberOfUnitsKilled = NULL;
@@ -123,6 +124,7 @@ void ControlBar::initObserverControls( void )
 	staticTextPlayerName = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:StaticTextPlayerName"));
 	winFlag = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:WinFlag"));
 	winGeneralPortrait = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:WinGeneralPortrait"));
+	buttonIdleWorker = TheWindowManager->winGetWindowFromId(NULL, NAMEKEY("ControlBar.wnd:ButtonIdleWorker"));
 
 	buttonCancelID = TheNameKeyGenerator->nameToKey("ControlBar.wnd:ButtonCancel");
 }
@@ -163,6 +165,7 @@ WindowMsgHandledType ControlBarObserverSystem( GameWindow *window, UnsignedInt m
 				TheControlBar->setObserverLookAtPlayer(NULL);
 				ObserverPlayerInfoWindow->winHide(TRUE);
 				ObserverPlayerListWindow->winHide(FALSE);
+				buttonIdleWorker->winHide(TRUE);
 				TheControlBar->populateObserverList();
 
 			}
@@ -301,6 +304,7 @@ void ControlBar::populateObserverInfoWindow ( void )
 	{
 		ObserverPlayerInfoWindow->winHide(TRUE);
 		ObserverPlayerListWindow->winHide(FALSE);
+		buttonIdleWorker->winHide(TRUE);
 		populateObserverList();
 		return;
 	}
@@ -338,4 +342,5 @@ void ControlBar::populateObserverInfoWindow ( void )
 	staticTextPlayerName->winSetEnabledTextColors(color, GameMakeColor(0,0,0,255));
 	winFlag->winSetEnabledImage(0, m_observerLookAtPlayer->getPlayerTemplate()->getFlagWaterMarkImage());
 	winGeneralPortrait->winHide(FALSE);
+	buttonIdleWorker->winHide(FALSE);
 }
diff --git a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp
@@ -5428,7 +5428,7 @@ void InGameUI::removeIdleWorker( Object *obj, Int playerNumber )
 
 void InGameUI::selectNextIdleWorker( void )
 {
-	Int index = ThePlayerList->getLocalPlayer()->getPlayerIndex();
+	Int index = TheControlBar->getCurrentlyViewedPlayer()->getPlayerIndex();
 	if(m_idleWorkers[index].empty())
 	{
 		DEBUG_ASSERTCRASH(FALSE, ("InGameUI::selectNextIdleWorker We're trying to select a worker when our list is empty for player %ls", ThePlayerList->getLocalPlayer()->getPlayerDisplayName().str()));
@@ -5518,8 +5518,13 @@ ObjectPtrVector InGameUI::getUniqueIdleWorkers(const ObjectList& idleWorkers)
 
 Int InGameUI::getIdleWorkerCount( void )
 {
-	Int index = ThePlayerList->getLocalPlayer()->getPlayerIndex();
-	return m_idleWorkers[index].size();
+	if (Player* player = TheControlBar->getCurrentlyViewedPlayer())
+	{
+		Int index = player->getPlayerIndex();
+		return m_idleWorkers[index].size();
+	}
+
+	return 0;
 }
 
 void InGameUI::showIdleWorkerLayout( void )
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp
@@ -89,6 +89,7 @@ static NameKeyType buttonCancelID = NAMEKEY_INVALID;
 
 static GameWindow *winFlag = NULL;
 static GameWindow *winGeneralPortrait = NULL;
+static GameWindow *buttonIdleWorker = NULL;
 static GameWindow *staticTextNumberOfUnits = NULL;
 static GameWindow *staticTextNumberOfBuildings = NULL;
 static GameWindow *staticTextNumberOfUnitsKilled = NULL;
@@ -123,6 +124,7 @@ void ControlBar::initObserverControls( void )
 	staticTextPlayerName = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:StaticTextPlayerName"));
 	winFlag = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:WinFlag"));
 	winGeneralPortrait = TheWindowManager->winGetWindowFromId(NULL, TheNameKeyGenerator->nameToKey("ControlBar.wnd:WinGeneralPortrait"));
+	buttonIdleWorker = TheWindowManager->winGetWindowFromId(NULL, NAMEKEY("ControlBar.wnd:ButtonIdleWorker"));
 
 	buttonCancelID = TheNameKeyGenerator->nameToKey("ControlBar.wnd:ButtonCancel");
 }
@@ -163,6 +165,7 @@ WindowMsgHandledType ControlBarObserverSystem( GameWindow *window, UnsignedInt m
 				TheControlBar->setObserverLookAtPlayer(NULL);
 				ObserverPlayerInfoWindow->winHide(TRUE);
 				ObserverPlayerListWindow->winHide(FALSE);
+				buttonIdleWorker->winHide(TRUE);
 				TheControlBar->populateObserverList();
 
 			}
@@ -301,6 +304,7 @@ void ControlBar::populateObserverInfoWindow ( void )
 	{
 		ObserverPlayerInfoWindow->winHide(TRUE);
 		ObserverPlayerListWindow->winHide(FALSE);
+		buttonIdleWorker->winHide(TRUE);
 		populateObserverList();
 		return;
 	}
@@ -338,4 +342,5 @@ void ControlBar::populateObserverInfoWindow ( void )
 	staticTextPlayerName->winSetEnabledTextColors(color, GameMakeColor(0,0,0,255));
 	winFlag->winSetEnabledImage(0, m_observerLookAtPlayer->getPlayerTemplate()->getFlagWaterMarkImage());
 	winGeneralPortrait->winHide(FALSE);
+	buttonIdleWorker->winHide(FALSE);
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp
@@ -5600,7 +5600,7 @@ void InGameUI::removeIdleWorker( Object *obj, Int playerNumber )
 
 void InGameUI::selectNextIdleWorker( void )
 {
-	Int index = ThePlayerList->getLocalPlayer()->getPlayerIndex();
+	Int index = TheControlBar->getCurrentlyViewedPlayer()->getPlayerIndex();
 	if(m_idleWorkers[index].empty())
 	{
 		DEBUG_ASSERTCRASH(FALSE, ("InGameUI::selectNextIdleWorker We're trying to select a worker when our list is empty for player %ls", ThePlayerList->getLocalPlayer()->getPlayerDisplayName().str()));
@@ -5690,8 +5690,13 @@ ObjectPtrVector InGameUI::getUniqueIdleWorkers(const ObjectList& idleWorkers)
 
 Int InGameUI::getIdleWorkerCount( void )
 {
-	Int index = ThePlayerList->getLocalPlayer()->getPlayerIndex();
-	return m_idleWorkers[index].size();
+	if (Player* player = TheControlBar->getCurrentlyViewedPlayer())
+	{
+		Int index = player->getPlayerIndex();
+		return m_idleWorkers[index].size();
+	}
+
+	return 0;
 }
 
 void InGameUI::showIdleWorkerLayout( void )

Original file line number	Diff line number	Diff line change
`@@ -5428,7 +5428,7 @@ void InGameUI::removeIdleWorker( Object *obj, Int playerNumber )`
`5428`	`5428`
`5429`	`5429`	`void InGameUI::selectNextIdleWorker( void )`
`5430`	`5430`	`{`
`5431`		`- Int index = ThePlayerList->getLocalPlayer()->getPlayerIndex();`
	`5431`	`+ Int index = TheControlBar->getCurrentlyViewedPlayer()->getPlayerIndex();`
`5432`	`5432`	`if(m_idleWorkers[index].empty())`
`5433`	`5433`	`{`
`5434`	`5434`	`DEBUG_ASSERTCRASH(FALSE, ("InGameUI::selectNextIdleWorker We're trying to select a worker when our list is empty for player %ls", ThePlayerList->getLocalPlayer()->getPlayerDisplayName().str()));`
`@@ -5518,8 +5518,13 @@ ObjectPtrVector InGameUI::getUniqueIdleWorkers(const ObjectList& idleWorkers)`
`5518`	`5518`
`5519`	`5519`	`Int InGameUI::getIdleWorkerCount( void )`
`5520`	`5520`	`{`
`5521`		`- Int index = ThePlayerList->getLocalPlayer()->getPlayerIndex();`
`5522`		`- return m_idleWorkers[index].size();`
	`5521`	`+ if (Player* player = TheControlBar->getCurrentlyViewedPlayer())`
	`5522`	`+ {`
	`5523`	`+ Int index = player->getPlayerIndex();`
	`5524`	`+ return m_idleWorkers[index].size();`
	`5525`	`+ }`
	`5526`	`+`
	`5527`	`+ return 0;`
`5523`	`5528`	`}`
`5524`	`5529`
`5525`	`5530`	`void InGameUI::showIdleWorkerLayout( void )`
Original file line number	Diff line number	Diff line change
`@@ -5600,7 +5600,7 @@ void InGameUI::removeIdleWorker( Object *obj, Int playerNumber )`
`5600`	`5600`
`5601`	`5601`	`void InGameUI::selectNextIdleWorker( void )`
`5602`	`5602`	`{`
`5603`		`- Int index = ThePlayerList->getLocalPlayer()->getPlayerIndex();`
	`5603`	`+ Int index = TheControlBar->getCurrentlyViewedPlayer()->getPlayerIndex();`
`5604`	`5604`	`if(m_idleWorkers[index].empty())`
`5605`	`5605`	`{`
`5606`	`5606`	`DEBUG_ASSERTCRASH(FALSE, ("InGameUI::selectNextIdleWorker We're trying to select a worker when our list is empty for player %ls", ThePlayerList->getLocalPlayer()->getPlayerDisplayName().str()));`
`@@ -5690,8 +5690,13 @@ ObjectPtrVector InGameUI::getUniqueIdleWorkers(const ObjectList& idleWorkers)`
`5690`	`5690`
`5691`	`5691`	`Int InGameUI::getIdleWorkerCount( void )`
`5692`	`5692`	`{`
`5693`		`- Int index = ThePlayerList->getLocalPlayer()->getPlayerIndex();`
`5694`		`- return m_idleWorkers[index].size();`
	`5693`	`+ if (Player* player = TheControlBar->getCurrentlyViewedPlayer())`
	`5694`	`+ {`
	`5695`	`+ Int index = player->getPlayerIndex();`
	`5696`	`+ return m_idleWorkers[index].size();`
	`5697`	`+ }`
	`5698`	`+`
	`5699`	`+ return 0;`
`5695`	`5700`	`}`
`5696`	`5701`
`5697`	`5702`	`void InGameUI::showIdleWorkerLayout( void )`