tweak(eva): Enable more EVA events for observed players

Generals/Code/GameEngine/Include/GameLogic/Object.h

@@ -241,6 +241,7 @@ class Object : public Thing, public Snapshot
 	void removeCustomIndicatorColor();
 
 	Bool isLocallyControlled() const;
+	Bool isLocallyViewed() const;
 	Bool isNeutralControlled() const;
 
 	Bool getIsUndetectedDefector(void) const { return BitIsSet(m_privateStatus, UNDETECTED_DEFECTOR); }

Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ConvertToHijackedVehicleCrateCollide.cpp

@@ -144,7 +144,7 @@ Bool ConvertToHijackedVehicleCrateCollide::executeCrateBehavior( Object *other )
 
 	//Before the actual defection takes place, play the "vehicle stolen" EVA
 	//event if the local player is the victim!
-	if( other->isLocallyControlled() )
+	if( other->isLocallyViewed() )
 	{
 		TheEva->setShouldPlay( EVA_VehicleStolen );
 	}

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

@@ -35,6 +35,7 @@
 #include "Common/Dict.h"
 #include "Common/GameEngine.h"
 #include "Common/GameState.h"
+#include "Common/GameUtility.h"
 #include "Common/ModuleFactory.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -1543,6 +1544,14 @@ Bool Object::isLocallyControlled() const
 	return getControllingPlayer() == ThePlayerList->getLocalPlayer();
 }
 
+//=============================================================================
+// Object::isLocallyViewed
+//=============================================================================
+Bool Object::isLocallyViewed() const
+{
+	return getControllingPlayer() == rts::getObservedOrLocalPlayer();
+}
+
 //=============================================================================
 // Object::isLocallyControlled
 //=============================================================================
@@ -4092,7 +4101,7 @@ void Object::onDie( DamageInfo *damageInfo )
 	deathSound.setPlayerIndex( index );
 	TheAudio->addAudioEvent(&deathSound);
 
-	if (isLocallyControlled() && !selfInflicted) // wasLocallyControlled? :-)
+	if (isLocallyViewed() && !selfInflicted) // wasLocallyViewed? :-)
 	{
 		if (isKindOf(KINDOF_STRUCTURE) && isKindOf(KINDOF_MP_COUNT_FOR_VICTORY))
 		{

Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp

@@ -608,7 +608,7 @@ StateReturnType DozerActionDoActionState::update( void )
 					/// @todo need to write this
 
 					// do some UI stuff for the constrolling player
-					if( dozer->isLocallyControlled() )
+					if( dozer->isLocallyViewed() )
 					{
 
 						// message the the building player

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

@@ -903,7 +903,7 @@ UpdateSleepTime ProductionUpdate::update( void )
 				us->getID());
 
 			// print a message to the local player
-			if( us->isLocallyControlled() )
+			if( us->isLocallyViewed() )
 			{
 				UnicodeString msg;
 				UnicodeString format = TheGameText->fetch( "UPGRADE:UpgradeComplete" );

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

@@ -920,7 +920,7 @@ void SpecialAbilityUpdate::startPreparation()
 				draw->setAnimationCompletionTime(data->m_preparationFrames);
 
 			//Warn the victim so he might have a chance to react!
-			if( target && target->isLocallyControlled() )
+			if( target && target->isLocallyViewed() )
 			{
 				TheEva->setShouldPlay( EVA_BuildingBeingStolen );
 			}
@@ -954,7 +954,7 @@ void SpecialAbilityUpdate::startPreparation()
 				}
 
 				//Warn the victim so he might have a chance to react!
-				if( spTemplate->getSpecialPowerType() == SPECIAL_BLACKLOTUS_CAPTURE_BUILDING && target && target->isLocallyControlled() )
+				if( spTemplate->getSpecialPowerType() == SPECIAL_BLACKLOTUS_CAPTURE_BUILDING && target && target->isLocallyViewed() )
 				{
 					TheEva->setShouldPlay( EVA_BuildingBeingStolen );
 				}
@@ -1308,7 +1308,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
 			}
 
 			//Play the "building stolen" EVA event if the local player is the victim!
-			if( target && target->isLocallyControlled() )
+			if( target && target->isLocallyViewed() )
 			{
 				TheEva->setShouldPlay( EVA_BuildingStolen );
 			}
@@ -1358,7 +1358,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
 						controller->getScoreKeeper()->addMoneyEarned( cash );
 
 					//Play the "cash stolen" EVA event if the local player is the victim!
-					if( target && target->isLocallyControlled() )
+					if( target && target->isLocallyViewed() )
 					{
 						TheEva->setShouldPlay( EVA_CashStolen );
 					}

GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h

@@ -257,6 +257,7 @@ class Object : public Thing, public Snapshot
 	void removeCustomIndicatorColor();
 
 	Bool isLocallyControlled() const;
+	Bool isLocallyViewed() const;
 	Bool isNeutralControlled() const;
 
 	Bool getIsUndetectedDefector(void) const { return BitIsSet(m_privateStatus, UNDETECTED_DEFECTOR); }

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ConvertToHijackedVehicleCrateCollide.cpp

@@ -155,7 +155,7 @@ Bool ConvertToHijackedVehicleCrateCollide::executeCrateBehavior( Object *other )
 
 	//Before the actual defection takes place, play the "vehicle stolen" EVA
 	//event if the local player is the victim!
-	if( other->isLocallyControlled() )
+	if( other->isLocallyViewed() )
 	{
 		TheEva->setShouldPlay( EVA_VehicleStolen );
 	}

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageCommandCenterCrateCollide.cpp

@@ -136,7 +136,7 @@ Bool SabotageCommandCenterCrateCollide::executeCrateBehavior( Object *other )
 
 	//When the sabotage occurs, play the appropriate EVA
 	//event if the local player is the victim!
-	if( other->isLocallyControlled() )
+	if( other->isLocallyViewed() )
 	{
 		TheEva->setShouldPlay( EVA_BuildingSabotaged );
 	}

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageFakeBuilding.cpp

@@ -131,7 +131,7 @@ Bool SabotageFakeBuildingCrateCollide::executeCrateBehavior( Object *other )
 
 	//When the sabotage occurs, play the appropriate EVA
 	//event if the local player is the victim!
-	if( other->isLocallyControlled() )
+	if( other->isLocallyViewed() )
 	{
 		TheEva->setShouldPlay( EVA_BuildingSabotaged );
 	}

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageInternetCenterCrateCollide.cpp

@@ -166,7 +166,7 @@ Bool SabotageInternetCenterCrateCollide::executeCrateBehavior( Object *other )
 
   doSabotageFeedbackFX( other, CrateCollide::SAB_VICTIM_INTERNET_CENTER );
 
-	if( other->isLocallyControlled() )
+	if( other->isLocallyViewed() )
 	{
 		TheEva->setShouldPlay( EVA_BuildingSabotaged );
 	}

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageMilitaryFactoryCrateCollide.cpp

@@ -139,7 +139,7 @@ Bool SabotageMilitaryFactoryCrateCollide::executeCrateBehavior( Object *other )
 
   doSabotageFeedbackFX( other, CrateCollide::SAB_VICTIM_MILITARY_FACTORY );
 
-	if( other->isLocallyControlled() )
+	if( other->isLocallyViewed() )
 	{
 		TheEva->setShouldPlay( EVA_BuildingSabotaged );
 	}

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotagePowerPlantCrateCollide.cpp

@@ -131,7 +131,7 @@ Bool SabotagePowerPlantCrateCollide::executeCrateBehavior( Object *other )
 
 	//When the sabotage occurs, play the appropriate EVA
 	//event if the local player is the victim!
-	if( other->isLocallyControlled() )
+	if( other->isLocallyViewed() )
 	{
 		TheEva->setShouldPlay( EVA_BuildingSabotaged );
 	}

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSuperweaponCrateCollide.cpp

@@ -136,7 +136,7 @@ Bool SabotageSuperweaponCrateCollide::executeCrateBehavior( Object *other )
 
 	//When the sabotage occurs, play the appropriate EVA
 	//event if the local player is the victim!
-	if( other->isLocallyControlled() )
+	if( other->isLocallyViewed() )
 	{
 		TheEva->setShouldPlay( EVA_BuildingSabotaged );
 	}

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSupplyCenterCrateCollide.cpp

@@ -152,7 +152,7 @@ Bool SabotageSupplyCenterCrateCollide::executeCrateBehavior( Object *other )
 				controller->getScoreKeeper()->addMoneyEarned( cash );
 
 			//Play the "cash stolen" EVA event if the local player is the victim!
-			if( other->isLocallyControlled() )
+			if( other->isLocallyViewed() )
 			{
 				TheEva->setShouldPlay( EVA_CashStolen );
 			}
@@ -173,7 +173,7 @@ Bool SabotageSupplyCenterCrateCollide::executeCrateBehavior( Object *other )
 		}
 		else
 		{
-			if( other->isLocallyControlled() )
+			if( other->isLocallyViewed() )
 			{
 				TheEva->setShouldPlay( EVA_BuildingSabotaged );
 			}

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSupplyDropzoneCrateCollide.cpp

@@ -162,7 +162,7 @@ Bool SabotageSupplyDropzoneCrateCollide::executeCrateBehavior( Object *other )
 				controller->getScoreKeeper()->addMoneyEarned( cash );
 
 			//Play the "cash stolen" EVA event if the local player is the victim!
-			if( other->isLocallyControlled() )
+			if( other->isLocallyViewed() )
 			{
 				TheEva->setShouldPlay( EVA_CashStolen );
 			}
@@ -183,7 +183,7 @@ Bool SabotageSupplyDropzoneCrateCollide::executeCrateBehavior( Object *other )
 		}
 		else
 		{
-			if( other->isLocallyControlled() )
+			if( other->isLocallyViewed() )
 			{
 				TheEva->setShouldPlay( EVA_BuildingSabotaged );
 			}

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

@@ -35,6 +35,7 @@
 #include "Common/Dict.h"
 #include "Common/GameEngine.h"
 #include "Common/GameState.h"
+#include "Common/GameUtility.h"
 #include "Common/ModuleFactory.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -1698,6 +1699,14 @@ Bool Object::isLocallyControlled() const
 	return getControllingPlayer() == ThePlayerList->getLocalPlayer();
 }
 
+//=============================================================================
+// Object::isLocallyViewed
+//=============================================================================
+Bool Object::isLocallyViewed() const
+{
+	return getControllingPlayer() == rts::getObservedOrLocalPlayer();
+}
+
 //=============================================================================
 // Object::isLocallyControlled
 //=============================================================================
@@ -4595,7 +4604,7 @@ void Object::onDie( DamageInfo *damageInfo )
 	if(m_team)
 		m_team->notifyTeamOfObjectDeath();
 
-	if (isLocallyControlled() && !selfInflicted) // wasLocallyControlled? :-)
+	if (isLocallyViewed() && !selfInflicted) // wasLocallyViewed? :-)
 	{
 		if (isKindOf(KINDOF_STRUCTURE) && isKindOf(KINDOF_MP_COUNT_FOR_VICTORY))
 		{

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp

@@ -613,7 +613,7 @@ StateReturnType DozerActionDoActionState::update( void )
 					/// @todo need to write this
 
 					// do some UI stuff for the constrolling player
-					if( dozer->isLocallyControlled() )
+					if( dozer->isLocallyViewed() )
 					{
 
 						// message the the building player

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

@@ -906,7 +906,7 @@ UpdateSleepTime ProductionUpdate::update( void )
 				us->getID());
 
 			// print a message to the local player, if it wants one
-			if( us->isLocallyControlled() && !upgrade->getDisplayNameLabel().isEmpty() )
+			if( us->isLocallyViewed() && !upgrade->getDisplayNameLabel().isEmpty() )
 			{
 				UnicodeString msg;
 				UnicodeString format = TheGameText->fetch( "UPGRADE:UpgradeComplete" );

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

@@ -1033,7 +1033,7 @@ void SpecialAbilityUpdate::startPreparation()
         draw->setAnimationCompletionTime(data->m_preparationFrames);
 
       //Warn the victim so he might have a chance to react!
-      if( target && target->isLocallyControlled() )
+      if( target && target->isLocallyViewed() )
       {
         TheEva->setShouldPlay( EVA_BuildingBeingStolen );
       }
@@ -1068,7 +1068,7 @@ void SpecialAbilityUpdate::startPreparation()
         }
 
         //Warn the victim so he might have a chance to react!
-        if( spTemplate->getSpecialPowerType() == SPECIAL_BLACKLOTUS_CAPTURE_BUILDING && target && target->isLocallyControlled() )
+        if( spTemplate->getSpecialPowerType() == SPECIAL_BLACKLOTUS_CAPTURE_BUILDING && target && target->isLocallyViewed() )
         {
           TheEva->setShouldPlay( EVA_BuildingBeingStolen );
         }
@@ -1454,7 +1454,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
       }
 
       //Play the "building stolen" EVA event if the local player is the victim!
-      if( target && target->isLocallyControlled() )
+      if( target && target->isLocallyViewed() )
       {
         TheEva->setShouldPlay( EVA_BuildingStolen );
       }
@@ -1504,7 +1504,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
             controller->getScoreKeeper()->addMoneyEarned( cash );
 
           //Play the "cash stolen" EVA event if the local player is the victim!
-          if( target && target->isLocallyControlled() )
+          if( target && target->isLocallyViewed() )
           {
             TheEva->setShouldPlay( EVA_CashStolen );
           }