refactor(object): Replace explicit local player checks with Object::isLocallyControlled (#2512)

Author: Caball009

Core/GameEngine/Source/GameClient/SelectionInfo.cpp

@@ -386,7 +386,7 @@ Bool addDrawableToList( Drawable *draw, void *userData )
 	{
 		const Object *obj = draw->getObject();
 		if (obj)
-			if (obj->getControllingPlayer() != ThePlayerList->getLocalPlayer())
+			if (!obj->isLocallyControlled())
 				if (obj->getContain() && draw->getObject()->getContain()->getContainCount() > 0)
 					return FALSE;
 	}

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

@@ -243,7 +243,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 				break;
 
 			// sanity check, the building must be under our control to cancel construction
-			if( building->getControllingPlayer() != ThePlayerList->getLocalPlayer() )
+			if( !building->isLocallyControlled() )
 				break;
 
 			// do the message
@@ -357,7 +357,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 				break;
 
 			// sanity, we must control the producer ... if this isn't true they might be hacking the game
-			if( producer->getControllingPlayer() != ThePlayerList->getLocalPlayer() )
+			if( !producer->isLocallyControlled() )
 				break;
 
 			// send a message to cancel that particular production entry

Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/OverchargeBehavior.cpp

@@ -126,7 +126,7 @@ UpdateSleepTime OverchargeBehavior::update()
 			enable( FALSE );
 
 			// do some UI info for the local user if this is theirs
-			if( ThePlayerList->getLocalPlayer() == us->getControllingPlayer() )
+			if( us->isLocallyControlled() )
 			{
 
 				// print msg

Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp

@@ -1710,7 +1710,7 @@ void Object::attemptDamage( DamageInfo *damageInfo )
 			damageInfo->in.m_damageType != DAMAGE_HEALING &&
 			!BitIsSet(damageInfo->in.m_sourcePlayerMask, getControllingPlayer()->getPlayerMask()) &&
 			m_radarData != nullptr &&
-			getControllingPlayer() == ThePlayerList->getLocalPlayer() )
+			isLocallyControlled() )
 		TheRadar->tryUnderAttackEvent( this );
 
 }

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

@@ -375,7 +375,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 				break;
 
 			// sanity check, the building must be under our control to cancel construction
-			if( building->getControllingPlayer() != ThePlayerList->getLocalPlayer() )
+			if( !building->isLocallyControlled() )
 				break;
 
 			// do the message
@@ -490,7 +490,7 @@ CBCommandStatus ControlBar::processCommandUI( GameWindow *control,
 				break;
 
 			// sanity, we must control the producer ... if this isn't true they might be hacking the game
-			if( producer->getControllingPlayer() != ThePlayerList->getLocalPlayer() )
+			if( !producer->isLocallyControlled() )
 				break;
 
 			// send a message to cancel that particular production entry

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/OverchargeBehavior.cpp

@@ -126,7 +126,7 @@ UpdateSleepTime OverchargeBehavior::update()
 			enable( FALSE );
 
 			// do some UI info for the local user if this is theirs
-			if( ThePlayerList->getLocalPlayer() == us->getControllingPlayer() )
+			if( us->isLocallyControlled() )
 			{
 
 				// print msg

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/RiderChangeContain.cpp

@@ -324,7 +324,7 @@ void RiderChangeContain::onRemoving( Object *rider )
 		if( containDraw && riderDraw )
 		{
 			//Create the selection message for the rider if it's ours and SELECTED!
-			if( bike->getControllingPlayer() == ThePlayerList->getLocalPlayer() && containDraw->isSelected() )
+			if( bike->isLocallyControlled() && containDraw->isSelected() )
 			{
 				GameMessage *teamMsg = TheMessageStream->appendMessage( GameMessage::MSG_CREATE_SELECTED_GROUP );
 				teamMsg->appendBooleanArgument( FALSE );// not creating new team so pass false

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp

@@ -1916,7 +1916,7 @@ void Object::attemptDamage( DamageInfo *damageInfo )
 			getControllingPlayer() &&
 			!BitIsSet(damageInfo->in.m_sourcePlayerMask, getControllingPlayer()->getPlayerMask()) &&
 			m_radarData != nullptr &&
-			getControllingPlayer() == ThePlayerList->getLocalPlayer() )
+			isLocallyControlled() )
 		TheRadar->tryUnderAttackEvent( this );
 
 }

GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp

@@ -4030,7 +4030,7 @@ void GameLogic::destroyObject( Object *obj )
 	//Clean up special power shortcut bars
 	if( obj->hasAnySpecialPower() )
 	{
-		if( ThePlayerList->getLocalPlayer() == obj->getControllingPlayer() )
+		if( obj->isLocallyControlled() )
 		{
 			TheControlBar->markUIDirty();
 		}