Skip to content

fix(alarm): Disable radar alarms for USA cargo planes #2862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
githubawn wants to merge 2 commits into
base: main
Choose a base branch
from
+14 −2
Open

fix(alarm): Disable radar alarms for USA cargo planes #2862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
889db34
disable cargo plane alarms
githubawn Jul 8, 2026
acf5208
style(alarm): De-indent preprocessor directives in cargo plane check
githubawn Jul 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Core/GameEngine/Include/Common/GameDefines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );

}
Expand Down
6 changes: 5 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );

}
Expand Down
Loading