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

Stubbjax · web-flow · commit 5de3d6389d43 · 2025-11-18T18:20:42.000+01:00
diff --git a/Generals/Code/GameEngine/Include/GameLogic/Object.h b/Generals/Code/GameEngine/Include/GameLogic/Object.h
@@ -238,6 +238,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); }
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ConvertToHijackedVehicleCrateCollide.cpp b/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 );
 	}
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/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
 //=============================================================================
@@ -4090,7 +4099,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))
 		{
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp b/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
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp b/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" );
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp b/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 );
 					}
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h
@@ -254,6 +254,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); }
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/ConvertToHijackedVehicleCrateCollide.cpp b/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 );
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageCommandCenterCrateCollide.cpp b/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 );
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageFakeBuilding.cpp b/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 );
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageInternetCenterCrateCollide.cpp b/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 );
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageMilitaryFactoryCrateCollide.cpp b/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 );
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotagePowerPlantCrateCollide.cpp b/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 );
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSuperweaponCrateCollide.cpp b/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 );
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSupplyCenterCrateCollide.cpp b/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 );
 			}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SabotageSupplyDropzoneCrateCollide.cpp b/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 );
 			}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/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
 //=============================================================================
@@ -4592,7 +4601,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))
 		{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/DozerAIUpdate.cpp b/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
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp b/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" );
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp b/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 );
           }

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ Bool ConvertToHijackedVehicleCrateCollide::executeCrateBehavior( Object *other )`
`144`	`144`
`145`	`145`	`//Before the actual defection takes place, play the "vehicle stolen" EVA`
`146`	`146`	`//event if the local player is the victim!`
`147`		`- if( other->isLocallyControlled() )`
	`147`	`+ if( other->isLocallyViewed() )`
`148`	`148`	`{`
`149`	`149`	`TheEva->setShouldPlay( EVA_VehicleStolen );`
`150`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -608,7 +608,7 @@ StateReturnType DozerActionDoActionState::update( void )`
`608`	`608`	`/// @todo need to write this`
`609`	`609`
`610`	`610`	`// do some UI stuff for the constrolling player`
`611`		`- if( dozer->isLocallyControlled() )`
	`611`	`+ if( dozer->isLocallyViewed() )`
`612`	`612`	`{`
`613`	`613`
`614`	`614`	`// message the the building player`
Original file line number	Diff line number	Diff line change
`@@ -903,7 +903,7 @@ UpdateSleepTime ProductionUpdate::update( void )`
`903`	`903`	`us->getID());`
`904`	`904`
`905`	`905`	`// print a message to the local player`
`906`		`- if( us->isLocallyControlled() )`
	`906`	`+ if( us->isLocallyViewed() )`
`907`	`907`	`{`
`908`	`908`	`UnicodeString msg;`
`909`	`909`	`UnicodeString format = TheGameText->fetch( "UPGRADE:UpgradeComplete" );`
Original file line number	Diff line number	Diff line change
`@@ -920,7 +920,7 @@ void SpecialAbilityUpdate::startPreparation()`
`920`	`920`	`draw->setAnimationCompletionTime(data->m_preparationFrames);`
`921`	`921`
`922`	`922`	`//Warn the victim so he might have a chance to react!`
`923`		`- if( target && target->isLocallyControlled() )`
	`923`	`+ if( target && target->isLocallyViewed() )`
`924`	`924`	`{`
`925`	`925`	`TheEva->setShouldPlay( EVA_BuildingBeingStolen );`
`926`	`926`	`}`
`@@ -954,7 +954,7 @@ void SpecialAbilityUpdate::startPreparation()`
`954`	`954`	`}`
`955`	`955`
`956`	`956`	`//Warn the victim so he might have a chance to react!`
`957`		`- if( spTemplate->getSpecialPowerType() == SPECIAL_BLACKLOTUS_CAPTURE_BUILDING && target && target->isLocallyControlled() )`
	`957`	`+ if( spTemplate->getSpecialPowerType() == SPECIAL_BLACKLOTUS_CAPTURE_BUILDING && target && target->isLocallyViewed() )`
`958`	`958`	`{`
`959`	`959`	`TheEva->setShouldPlay( EVA_BuildingBeingStolen );`
`960`	`960`	`}`
`@@ -1308,7 +1308,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()`
`1308`	`1308`	`}`
`1309`	`1309`
`1310`	`1310`	`//Play the "building stolen" EVA event if the local player is the victim!`
`1311`		`- if( target && target->isLocallyControlled() )`
	`1311`	`+ if( target && target->isLocallyViewed() )`
`1312`	`1312`	`{`
`1313`	`1313`	`TheEva->setShouldPlay( EVA_BuildingStolen );`
`1314`	`1314`	`}`
`@@ -1358,7 +1358,7 @@ void SpecialAbilityUpdate::triggerAbilityEffect()`
`1358`	`1358`	`controller->getScoreKeeper()->addMoneyEarned( cash );`
`1359`	`1359`
`1360`	`1360`	`//Play the "cash stolen" EVA event if the local player is the victim!`
`1361`		`- if( target && target->isLocallyControlled() )`
	`1361`	`+ if( target && target->isLocallyViewed() )`
`1362`	`1362`	`{`
`1363`	`1363`	`TheEva->setShouldPlay( EVA_CashStolen );`
`1364`	`1364`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ Bool ConvertToHijackedVehicleCrateCollide::executeCrateBehavior( Object *other )`
`155`	`155`
`156`	`156`	`//Before the actual defection takes place, play the "vehicle stolen" EVA`
`157`	`157`	`//event if the local player is the victim!`
`158`		`- if( other->isLocallyControlled() )`
	`158`	`+ if( other->isLocallyViewed() )`
`159`	`159`	`{`
`160`	`160`	`TheEva->setShouldPlay( EVA_VehicleStolen );`
`161`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ Bool SabotageCommandCenterCrateCollide::executeCrateBehavior( Object *other )`
`136`	`136`
`137`	`137`	`//When the sabotage occurs, play the appropriate EVA`
`138`	`138`	`//event if the local player is the victim!`
`139`		`- if( other->isLocallyControlled() )`
	`139`	`+ if( other->isLocallyViewed() )`
`140`	`140`	`{`
`141`	`141`	`TheEva->setShouldPlay( EVA_BuildingSabotaged );`
`142`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ Bool SabotageFakeBuildingCrateCollide::executeCrateBehavior( Object *other )`
`131`	`131`
`132`	`132`	`//When the sabotage occurs, play the appropriate EVA`
`133`	`133`	`//event if the local player is the victim!`
`134`		`- if( other->isLocallyControlled() )`
	`134`	`+ if( other->isLocallyViewed() )`
`135`	`135`	`{`
`136`	`136`	`TheEva->setShouldPlay( EVA_BuildingSabotaged );`
`137`	`137`	`}`