refactor: Condense rally point display logic

Author: Stubbjax

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

@@ -1439,17 +1439,11 @@ void ControlBar::update( void )
 		Object* obj = drawToEvaluateFor ? drawToEvaluateFor->getObject() : NULL;
 		setPortraitByObject(obj);
 
-		if (obj && obj->getControllingPlayer() == getCurrentlyViewedPlayer())
-		{
-			ExitInterface* exit = obj->getObjectExitInterface();
-			if (exit)
-				showRallyPoint(exit->getRallyPoint());
-			else
-				showRallyPoint(NULL);
-		}
-		else
-			showRallyPoint(NULL);
+		const Coord3D* exitPosition = NULL;
+		if (obj && obj->getControllingPlayer() == getCurrentlyViewedPlayer() && obj->getObjectExitInterface())
+			exitPosition = obj->getObjectExitInterface()->getRallyPoint();
 
+		showRallyPoint(exitPosition);
 		return;
 	}
 

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

@@ -1462,17 +1462,11 @@ void ControlBar::update( void )
 		Object* obj = drawToEvaluateFor ? drawToEvaluateFor->getObject() : NULL;
 		setPortraitByObject(obj);
 
-		if (obj && obj->getControllingPlayer() == getCurrentlyViewedPlayer())
-		{
-			ExitInterface* exit = obj->getObjectExitInterface();
-			if (exit)
-				showRallyPoint(exit->getRallyPoint());
-			else
-				showRallyPoint(NULL);
-		}
-		else
-			showRallyPoint(NULL);
+		const Coord3D* exitPosition = NULL;
+		if (obj && obj->getControllingPlayer() == getCurrentlyViewedPlayer() && obj->getObjectExitInterface())
+			exitPosition = obj->getObjectExitInterface()->getRallyPoint();
 
+		showRallyPoint(exitPosition);
 		return;
 	}