tweak(controlbar): Show stealthed radar objects to observers (#1487)

Author: Stubbjax

Generals/Code/GameEngine/Include/GameClient/ControlBar.h

@@ -733,6 +733,8 @@ class ControlBar : public SubsystemInterface
 
 	/// Returns the currently viewed player. May return NULL if no player is selected while observing.
 	Player* getCurrentlyViewedPlayer();
+	/// Returns the relationship with the currently viewed player. May return NEUTRAL if no player is selected while observing.
+	Relationship getCurrentlyViewedPlayerRelationship(const Team* team);
 
 //	ControlBarResizer *getControlBarResizer( void ) {return m_controlBarResizer;}
 

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

@@ -165,6 +165,14 @@ Player* ControlBar::getCurrentlyViewedPlayer()
 	return ThePlayerList->getLocalPlayer();
 }
 
+Relationship ControlBar::getCurrentlyViewedPlayerRelationship(const Team* team)
+{
+	if (Player* player = getCurrentlyViewedPlayer())
+		return player->getRelationship(team);
+
+	return NEUTRAL;
+}
+
 void ControlBar::populatePurchaseScience( Player* player )
 {
 //	TheInGameUI->deselectAllDrawables();

Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp

@@ -42,6 +42,7 @@
 #include "GameLogic/Module/StealthUpdate.h"
 
 #include "GameClient/Color.h"
+#include "GameClient/ControlBar.h"
 #include "GameClient/Display.h"
 #include "GameClient/GameClient.h"
 #include "GameClient/GameWindow.h"
@@ -696,7 +697,7 @@ void W3DRadar::renderObjectList( const RadarObject *listHead, TextureClass *text
 			if( !stealth )
 				continue;
 
-      if ( ThePlayerList->getLocalPlayer()->getRelationship(obj->getTeam()) == ENEMIES )
+      if ( TheControlBar->getCurrentlyViewedPlayerRelationship(obj->getTeam()) == ENEMIES )
         if( !obj->testStatus( OBJECT_STATUS_DETECTED ) && !stealth->isDisguised() )
 				  skip = TRUE;
 

GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h

@@ -747,6 +747,8 @@ class ControlBar : public SubsystemInterface
 
 	/// Returns the currently viewed player. May return NULL if no player is selected while observing.
 	Player* getCurrentlyViewedPlayer();
+	/// Returns the relationship with the currently viewed player. May return NEUTRAL if no player is selected while observing.
+	Relationship getCurrentlyViewedPlayerRelationship(const Team* team);
 
 //	ControlBarResizer *getControlBarResizer( void ) {return m_controlBarResizer;}
 

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

@@ -166,6 +166,14 @@ Player* ControlBar::getCurrentlyViewedPlayer()
 	return ThePlayerList->getLocalPlayer();
 }
 
+Relationship ControlBar::getCurrentlyViewedPlayerRelationship(const Team* team)
+{
+	if (Player* player = getCurrentlyViewedPlayer())
+		return player->getRelationship(team);
+
+	return NEUTRAL;
+}
+
 void ControlBar::populatePurchaseScience( Player* player )
 {
 //	TheInGameUI->deselectAllDrawables();

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp

@@ -40,6 +40,7 @@
 #include "GameLogic/Object.h"
 
 #include "GameClient/Color.h"
+#include "GameClient/ControlBar.h"
 #include "GameClient/Display.h"
 #include "GameClient/GameClient.h"
 #include "GameClient/GameWindow.h"
@@ -690,7 +691,7 @@ void W3DRadar::renderObjectList( const RadarObject *listHead, TextureClass *text
 		// Now it twinkles for any stealthed object, whether locally controlled or neutral-observier-viewed
 		if( obj->testStatus( OBJECT_STATUS_STEALTHED ) )
 		{
-      if ( ThePlayerList->getLocalPlayer()->getRelationship(obj->getTeam()) == ENEMIES )
+      if ( TheControlBar->getCurrentlyViewedPlayerRelationship(obj->getTeam()) == ENEMIES )
         if( !obj->testStatus( OBJECT_STATUS_DETECTED ) && !obj->testStatus( OBJECT_STATUS_DISGUISED ) )
 				  skip = TRUE;