From 889db34f9b64dd9242ff56d3ad426f472079cb8d Mon Sep 17 00:00:00 2001
From: githubawn <115191165+githubawn@users.noreply.github.com>
Date: Wed, 8 Jul 2026 21:09:25 +0200
Subject: [PATCH 1/2] disable cargo plane alarms

---
 Core/GameEngine/Include/Common/GameDefines.h                | 4 ++++
 Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp | 6 +++++-
 .../Code/GameEngine/Source/GameLogic/Object/Object.cpp      | 6 +++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

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..36b563d8734 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..86527ce3199 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 );
 
 }

From acf520811faf1db2993331bbbd2b0a61d6864c6e Mon Sep 17 00:00:00 2001
From: githubawn <115191165+githubawn@users.noreply.github.com>
Date: Thu, 9 Jul 2026 00:34:01 +0200
Subject: [PATCH 2/2] style(alarm): De-indent preprocessor directives in cargo
 plane check

Preprocessor #if/#endif directives are not allowed indentation in this
codebase; align with existing convention in the file.
---
 Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp | 6 +++---
 .../Code/GameEngine/Source/GameLogic/Object/Object.cpp      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp
index 36b563d8734..28eea4f43b6 100644
--- a/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp
+++ b/Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp
@@ -1761,9 +1761,9 @@ void Object::attemptDamage( DamageInfo *damageInfo )
 			!BitIsSet(damageInfo->in.m_sourcePlayerMask, getControllingPlayer()->getPlayerMask()) &&
 			m_radarData != nullptr &&
 			isLocallyControlled()
-			#if !PRESERVE_CARGO_PLANE_ATTACK_WARNINGS
-				&& getTemplate()->getName() != "AmericaJetCargoPlane"
-			#endif
+#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 86527ce3199..239267d17fc 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp
@@ -1961,9 +1961,9 @@ void Object::attemptDamage( DamageInfo *damageInfo )
 			!BitIsSet(damageInfo->in.m_sourcePlayerMask, getControllingPlayer()->getPlayerMask()) &&
 			m_radarData != nullptr &&
 			isLocallyControlled()
-			#if !PRESERVE_CARGO_PLANE_ATTACK_WARNINGS
-				&& getTemplate()->getName() != "AmericaJetCargoPlane"
-			#endif
+#if !PRESERVE_CARGO_PLANE_ATTACK_WARNINGS
+			&& getTemplate()->getName() != "AmericaJetCargoPlane"
+#endif
 			)
 		TheRadar->tryUnderAttackEvent( this );