Skip to content

feat(object): Implement KINDOF_NO_ATTACK_WARNING to suppress alarm events on object attacks #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 6 commits into
base: main
Choose a base branch
from
Open

feat(object): Implement KINDOF_NO_ATTACK_WARNING to suppress alarm events on object attacks #2862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
176ff40
disable cargo plane alarms
githubawn Jul 8, 2026
2aa7ec6
style(alarm): De-indent preprocessor directives in cargo plane check
githubawn Jul 8, 2026
6459496
Replace cargo plane name check with NO_ATTACK_WARNING KindOf
githubawn Jul 15, 2026
9631808
Add unused KindOf padding bit to fix duplicate symbol link error
githubawn Jul 15, 2026
aeb2127
style(kindof): Update KindOf comment and remove obsolete UNUSED_1 pad…
githubawn Jul 31, 2026
3cb5ecb
update comment
githubawn Jul 31, 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 Generals/Code/GameEngine/Include/Common/KindOf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,10 @@ enum KindOfType CPP_11(: Int)
KINDOF_CONSERVATIVE_BUILDING, ///< Conservative structures aren't considered part of your base for sneak attack boundary calculations...
KINDOF_IGNORE_DOCKING_BONES, ///< Structure will not look up docking bones. Patch 1.03 hack.

// TheSuperHackers @info New kinds for Mods

KINDOF_NO_ATTACK_WARNING, ///< does not trigger the under attack radar/EVA warning when taking damage

KINDOF_COUNT, // total number of kindofs
KINDOF_FIRST = 0,
};
Expand Down
1 change: 1 addition & 0 deletions Generals/Code/GameEngine/Source/Common/System/KindOf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ const char* const KindOfMaskType::s_bitNameList[] =
"DEMOTRAP",
"CONSERVATIVE_BUILDING",
"IGNORE_DOCKING_BONES",
"NO_ATTACK_WARNING",

nullptr
};
Expand Down
3 changes: 2 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 @@ -1769,7 +1769,8 @@ void Object::attemptDamage( DamageInfo *damageInfo )
damageInfo->in.m_damageType != DAMAGE_HEALING &&
!BitIsSet(damageInfo->in.m_sourcePlayerMask, getControllingPlayer()->getPlayerMask()) &&
m_radarData != nullptr &&
isLocallyControlled() )
isLocallyControlled() &&
!isKindOf( KINDOF_NO_ATTACK_WARNING ) )
Comment thread
githubawn marked this conversation as resolved.
TheRadar->tryUnderAttackEvent( this );

}
Expand Down
4 changes: 4 additions & 0 deletions GeneralsMD/Code/GameEngine/Include/Common/KindOf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,10 @@ enum KindOfType CPP_11(: Int)
KINDOF_CONSERVATIVE_BUILDING, ///< Conservative structures aren't considered part of your base for sneak attack boundary calculations...
KINDOF_IGNORE_DOCKING_BONES, ///< Structure will not look up docking bones. Patch 1.03 hack.

// TheSuperHackers @info New kinds for Mods

KINDOF_NO_ATTACK_WARNING, ///< does not trigger the under attack radar/EVA warning when taking damage

KINDOF_COUNT, // total number of kindofs
KINDOF_FIRST = 0,
};
Expand Down
1 change: 1 addition & 0 deletions GeneralsMD/Code/GameEngine/Source/Common/System/KindOf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ const char* const KindOfMaskType::s_bitNameList[] =
"DEMOTRAP",
"CONSERVATIVE_BUILDING",
"IGNORE_DOCKING_BONES",
"NO_ATTACK_WARNING",

nullptr
};
Expand Down
3 changes: 2 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 @@ -1969,7 +1969,8 @@ void Object::attemptDamage( DamageInfo *damageInfo )
getControllingPlayer() &&
!BitIsSet(damageInfo->in.m_sourcePlayerMask, getControllingPlayer()->getPlayerMask()) &&
m_radarData != nullptr &&
isLocallyControlled() )
isLocallyControlled() &&
!isKindOf( KINDOF_NO_ATTACK_WARNING ) )
TheRadar->tryUnderAttackEvent( this );

}
Expand Down
Loading