refactor: Simplify logic

Author: Stubbjax

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

@@ -167,15 +167,10 @@ Player* ControlBar::getCurrentlyViewedPlayer()
 
 Relationship ControlBar::getCurrentlyViewedPlayerRelationship(const Team* team)
 {
-	if (TheControlBar->isObserverControlBarOn())
-	{
-		if (!TheControlBar->getObserverLookAtPlayer())
-			return NEUTRAL;
-
-		return TheControlBar->getObserverLookAtPlayer()->getRelationship(team);
-	}
+	if (Player* player = getCurrentlyViewedPlayer())
+		return player->getRelationship(team);
 
-	return ThePlayerList->getLocalPlayer()->getRelationship(team);
+	return NEUTRAL;
 }
 
 void ControlBar::populatePurchaseScience( Player* player )

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

@@ -168,15 +168,10 @@ Player* ControlBar::getCurrentlyViewedPlayer()
 
 Relationship ControlBar::getCurrentlyViewedPlayerRelationship(const Team* team)
 {
-	if (TheControlBar->isObserverControlBarOn())
-	{
-		if (!TheControlBar->getObserverLookAtPlayer())
-			return NEUTRAL;
-
-		return TheControlBar->getObserverLookAtPlayer()->getRelationship(team);
-	}
+	if (Player* player = getCurrentlyViewedPlayer())
+		return player->getRelationship(team);
 
-	return ThePlayerList->getLocalPlayer()->getRelationship(team);
+	return NEUTRAL;
 }
 
 void ControlBar::populatePurchaseScience( Player* player )