chore: Replicate changes in Generals

Author: Stubbjax

Generals/Code/GameEngine/Source/GameClient/Drawable.cpp

@@ -63,6 +63,7 @@
 #include "GameLogic/Weapon.h"
 
 #include "GameClient/Anim2D.h"
+#include "GameClient/ControlBar.h"
 #include "GameClient/Display.h"
 #include "GameClient/DisplayStringManager.h"
 #include "GameClient/Drawable.h"
@@ -2285,7 +2286,7 @@ Bool Drawable::drawsAnyUIText( void )
 		return FALSE;
 
 	const Object *obj = getObject();
-	if ( !obj || !obj->isLocallyControlled() )
+	if ( !obj || obj->getControllingPlayer() != TheControlBar->getCurrentlyViewedPlayer())
 		return FALSE;
 
 	Player *owner = obj->getControllingPlayer();
@@ -2434,7 +2435,7 @@ void Drawable::drawAmmo( const IRegion2D *healthBarRegion )
 	if (!(
 				TheGlobalData->m_showObjectHealth &&
 				(isSelected() || (TheInGameUI && (TheInGameUI->getMousedOverDrawableID() == getID()))) &&
-				obj->getControllingPlayer() == ThePlayerList->getLocalPlayer()
+				obj->getControllingPlayer() == TheControlBar->getCurrentlyViewedPlayer()
 			))
 		return;
 
@@ -2492,7 +2493,7 @@ void Drawable::drawContained( const IRegion2D *healthBarRegion )
 	if (!(
 				TheGlobalData->m_showObjectHealth &&
 				(isSelected() || (TheInGameUI && (TheInGameUI->getMousedOverDrawableID() == getID()))) &&
-				obj->getControllingPlayer() == ThePlayerList->getLocalPlayer()
+				obj->getControllingPlayer() == TheControlBar->getCurrentlyViewedPlayer()
 			))
 		return;
 
@@ -2965,7 +2966,7 @@ void Drawable::drawBombed(const IRegion2D* healthBarRegion)
 	UnsignedInt now = TheGameLogic->getFrame();
 
 	if( obj->testWeaponSetFlag( WEAPONSET_CARBOMB ) &&
-				obj->getControllingPlayer() == ThePlayerList->getLocalPlayer())
+				obj->getControllingPlayer() == TheControlBar->getCurrentlyViewedPlayer())
 	{
 		if( !getIconInfo()->m_icon[ ICON_CARBOMB ] )
 			getIconInfo()->m_icon[ ICON_CARBOMB ] = newInstance(Anim2D)( s_animationTemplates[ ICON_CARBOMB ], TheAnim2DCollection );

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

@@ -1438,6 +1438,18 @@ 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);
+
 		return;
 	}
 
@@ -2716,7 +2728,9 @@ 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 = ThePlayerList->getLocalPlayer();
+		Player* player = TheControlBar->getCurrentlyViewedPlayer();
+		if (!player)
+			return;
 
 		if (TheGlobalData->m_timeOfDay == TIME_OF_DAY_NIGHT)
 			marker->setIndicatorColor( player->getPlayerNightColor() );

Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp

@@ -63,6 +63,7 @@
 #include "Common/ThingFactory.h"
 #include "Common/ThingTemplate.h"
 
+#include "GameClient/ControlBar.h"
 #include "GameClient/Drawable.h"
 #include "GameClient/GameClient.h"
 #include "GameClient/InGameUI.h"
@@ -224,7 +225,7 @@ void W3DWaypointBuffer::drawWaypoints(RenderInfoClass &rinfo)
 			Int numPoints = 0;
 			if( obj )
 			{
-				if ( ! obj->isLocallyControlled())
+				if ( obj->getControllingPlayer() != TheControlBar->getCurrentlyViewedPlayer())
 					continue;
 
 				ExitInterface *exitInterface = obj->getObjectExitInterface();