refactor: More concise logic flow without extra assignment

Stubbjax · Stubbjax · commit b4376572b866 · 2025-08-24T16:51:20.000+10:00
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp
@@ -167,18 +167,15 @@ Player* ControlBar::getCurrentlyViewedPlayer()
 
 Relationship ControlBar::getCurrentlyViewedPlayerRelationship(const Team* team)
 {
-	Player* player = NULL;
-
 	if (TheControlBar->isObserverControlBarOn())
 	{
-		player = TheControlBar->getObserverLookAtPlayer();
-		if (!player)
+		if (!TheControlBar->getObserverLookAtPlayer())
 			return NEUTRAL;
+
+		return TheControlBar->getObserverLookAtPlayer()->getRelationship(team);
 	}
-	else
-		player = ThePlayerList->getLocalPlayer();
 
-	return player->getRelationship(team);
+	return ThePlayerList->getLocalPlayer()->getRelationship(team);
 }
 
 void ControlBar::populatePurchaseScience( Player* player )
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp
@@ -168,18 +168,15 @@ Player* ControlBar::getCurrentlyViewedPlayer()
 
 Relationship ControlBar::getCurrentlyViewedPlayerRelationship(const Team* team)
 {
-	Player* player = NULL;
-
 	if (TheControlBar->isObserverControlBarOn())
 	{
-		player = TheControlBar->getObserverLookAtPlayer();
-		if (!player)
+		if (!TheControlBar->getObserverLookAtPlayer())
 			return NEUTRAL;
+
+		return TheControlBar->getObserverLookAtPlayer()->getRelationship(team);
 	}
-	else
-		player = ThePlayerList->getLocalPlayer();
 
-	return player->getRelationship(team);
+	return ThePlayerList->getLocalPlayer()->getRelationship(team);
 }
 
 void ControlBar::populatePurchaseScience( Player* player )

Original file line number	Diff line number	Diff line change
`@@ -167,18 +167,15 @@ Player* ControlBar::getCurrentlyViewedPlayer()`
`167`	`167`
`168`	`168`	`Relationship ControlBar::getCurrentlyViewedPlayerRelationship(const Team* team)`
`169`	`169`	`{`
`170`		`- Player* player = NULL;`
`171`		`-`
`172`	`170`	`if (TheControlBar->isObserverControlBarOn())`
`173`	`171`	`{`
`174`		`- player = TheControlBar->getObserverLookAtPlayer();`
`175`		`- if (!player)`
	`172`	`+ if (!TheControlBar->getObserverLookAtPlayer())`
`176`	`173`	`return NEUTRAL;`
	`174`	`+`
	`175`	`+ return TheControlBar->getObserverLookAtPlayer()->getRelationship(team);`
`177`	`176`	`}`
`178`		`- else`
`179`		`- player = ThePlayerList->getLocalPlayer();`
`180`	`177`
`181`		`- return player->getRelationship(team);`
	`178`	`+ return ThePlayerList->getLocalPlayer()->getRelationship(team);`
`182`	`179`	`}`
`183`	`180`
`184`	`181`	`void ControlBar::populatePurchaseScience( Player* player )`
Original file line number	Diff line number	Diff line change
`@@ -168,18 +168,15 @@ Player* ControlBar::getCurrentlyViewedPlayer()`
`168`	`168`
`169`	`169`	`Relationship ControlBar::getCurrentlyViewedPlayerRelationship(const Team* team)`
`170`	`170`	`{`
`171`		`- Player* player = NULL;`
`172`		`-`
`173`	`171`	`if (TheControlBar->isObserverControlBarOn())`
`174`	`172`	`{`
`175`		`- player = TheControlBar->getObserverLookAtPlayer();`
`176`		`- if (!player)`
	`173`	`+ if (!TheControlBar->getObserverLookAtPlayer())`
`177`	`174`	`return NEUTRAL;`
	`175`	`+`
	`176`	`+ return TheControlBar->getObserverLookAtPlayer()->getRelationship(team);`
`178`	`177`	`}`
`179`		`- else`
`180`		`- player = ThePlayerList->getLocalPlayer();`
`181`	`178`
`182`		`- return player->getRelationship(team);`
	`179`	`+ return ThePlayerList->getLocalPlayer()->getRelationship(team);`
`183`	`180`	`}`
`184`	`181`
`185`	`182`	`void ControlBar::populatePurchaseScience( Player* player )`