diff --git a/Core/GameEngine/Include/Common/GameDefines.h b/Core/GameEngine/Include/Common/GameDefines.h index 1bf9f096fcf..cdf3af4c732 100644 --- a/Core/GameEngine/Include/Common/GameDefines.h +++ b/Core/GameEngine/Include/Common/GameDefines.h @@ -27,6 +27,10 @@ #define PRESERVE_BUILDING_RESUMPTION_DELAY (0) // The fix for this unfavorable behavior was approved by the Game Design Committee. #endif +#ifndef PRESERVE_CARGO_PLANE_ATTACK_WARNINGS +#define PRESERVE_CARGO_PLANE_ATTACK_WARNINGS (0) +#endif + #ifndef PRESERVE_CHINOOK_PASSENGER_DUMPING #define PRESERVE_CHINOOK_PASSENGER_DUMPING (1) #endif diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp index 461e3495539..28eea4f43b6 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp @@ -1760,7 +1760,11 @@ void Object::attemptDamage( DamageInfo *damageInfo ) damageInfo->in.m_damageType != DAMAGE_HEALING && !BitIsSet(damageInfo->in.m_sourcePlayerMask, getControllingPlayer()->getPlayerMask()) && m_radarData != nullptr && - isLocallyControlled() ) + isLocallyControlled() +#if !PRESERVE_CARGO_PLANE_ATTACK_WARNINGS + && getTemplate()->getName() != "AmericaJetCargoPlane" +#endif + ) TheRadar->tryUnderAttackEvent( this ); } diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp index 0bd898aae75..239267d17fc 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp @@ -1960,7 +1960,11 @@ void Object::attemptDamage( DamageInfo *damageInfo ) getControllingPlayer() && !BitIsSet(damageInfo->in.m_sourcePlayerMask, getControllingPlayer()->getPlayerMask()) && m_radarData != nullptr && - isLocallyControlled() ) + isLocallyControlled() +#if !PRESERVE_CARGO_PLANE_ATTACK_WARNINGS + && getTemplate()->getName() != "AmericaJetCargoPlane" +#endif + ) TheRadar->tryUnderAttackEvent( this ); }