Revert "tweak: Update more events"

This reverts commit 9dfa949.

Author: Stubbjax

Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp

@@ -37,7 +37,6 @@
 
 #include "Common/ActionManager.h"
 #include "Common/GameType.h"
-#include "Common/GameUtility.h"
 #include "Common/MultiplayerSettings.h"
 #include "Common/NameKeyGenerator.h"
 #include "Common/Override.h"
@@ -1447,7 +1446,7 @@ void ControlBar::update( void )
 		setPortraitByObject(obj);
 
 		const Coord3D* exitPosition = NULL;
-		if (obj && obj->getControllingPlayer() == rts::getObservedOrLocalPlayer() && obj->getObjectExitInterface())
+		if (obj && obj->getControllingPlayer() == getCurrentlyViewedPlayer() && obj->getObjectExitInterface())
 			exitPosition = obj->getObjectExitInterface()->getRallyPoint();
 
 		showRallyPoint(exitPosition);
@@ -2725,12 +2724,14 @@ void ControlBar::showRallyPoint(const Coord3D* loc)
 	marker->setOrientation(TheGlobalData->m_downwindAngle); // To blow down wind -- ML
 
 	// set the marker colors to that of the local player
-	Player* player = rts::getObservedOrLocalPlayer();
-
-	if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT)
-		marker->setIndicatorColor(player->getPlayerNightColor());
-	else
-		marker->setIndicatorColor(player->getPlayerColor());
+	Player* player = TheControlBar->getCurrentlyViewedPlayer();
+	if (player)
+	{
+		if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT)
+			marker->setIndicatorColor(player->getPlayerNightColor());
+		else
+			marker->setIndicatorColor(player->getPlayerColor());
+	}
 }
 
 // ------------------------------------------------------------------------------------------------

Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp

@@ -67,7 +67,6 @@
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
-#include "Common/GameUtility.h"
 #include "Common/GlobalData.h"
 #include "Common/BuildAssistant.h"
 #include "Common/Player.h"
@@ -519,9 +518,9 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 			name = TheGameText->fetch("CONTROLBAR:Power");
 			descrip = TheGameText->fetch("CONTROLBAR:PowerDescription");
 
-			Player* playerToDisplay = rts::getObservedOrLocalPlayer();
+			Player* playerToDisplay = TheControlBar->getCurrentlyViewedPlayer();
 
-			if( playerToDisplay->getEnergy() )
+			if( playerToDisplay && playerToDisplay->getEnergy() )
 			{
 				Energy *energy = playerToDisplay->getEnergy();
 				descrip.format(descrip, energy->getProduction(), energy->getConsumption());

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp

@@ -37,7 +37,6 @@
 
 #include "Common/ActionManager.h"
 #include "Common/GameType.h"
-#include "Common/GameUtility.h"
 #include "Common/MultiplayerSettings.h"
 #include "Common/NameKeyGenerator.h"
 #include "Common/Override.h"
@@ -1470,7 +1469,7 @@ void ControlBar::update( void )
 		setPortraitByObject(obj);
 
 		const Coord3D* exitPosition = NULL;
-		if (obj && obj->getControllingPlayer() == rts::getObservedOrLocalPlayer() && obj->getObjectExitInterface())
+		if (obj && obj->getControllingPlayer() == getCurrentlyViewedPlayer() && obj->getObjectExitInterface())
 			exitPosition = obj->getObjectExitInterface()->getRallyPoint();
 
 		showRallyPoint(exitPosition);
@@ -2748,12 +2747,14 @@ void ControlBar::showRallyPoint(const Coord3D* loc)
 	marker->setOrientation(TheGlobalData->m_downwindAngle); // To blow down wind -- ML
 
 	// set the marker colors to that of the local player
-	Player* player = rts::getObservedOrLocalPlayer();
-
-	if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT)
-		marker->setIndicatorColor(player->getPlayerNightColor());
-	else
-		marker->setIndicatorColor(player->getPlayerColor());
+	Player* player = TheControlBar->getCurrentlyViewedPlayer();
+	if (player)
+	{
+		if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT)
+			marker->setIndicatorColor(player->getPlayerNightColor());
+		else
+			marker->setIndicatorColor(player->getPlayerColor());
+	}
 }
 
 // ------------------------------------------------------------------------------------------------

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp

@@ -67,7 +67,6 @@
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
 
-#include "Common/GameUtility.h"
 #include "Common/GlobalData.h"
 #include "Common/BuildAssistant.h"
 #include "Common/Player.h"
@@ -568,9 +567,9 @@ void ControlBar::populateBuildTooltipLayout( const CommandButton *commandButton,
 			name = TheGameText->fetch("CONTROLBAR:Power");
 			descrip = TheGameText->fetch("CONTROLBAR:PowerDescription");
 
-			Player* playerToDisplay = rts::getObservedOrLocalPlayer();
+			Player* playerToDisplay = TheControlBar->getCurrentlyViewedPlayer();
 
-			if( playerToDisplay->getEnergy() )
+			if( playerToDisplay && playerToDisplay->getEnergy() )
 			{
 				Energy *energy = playerToDisplay->getEnergy();
 				descrip.format(descrip, energy->getProduction(), energy->getConsumption());