Skip to content

feat(alarm): Introduce KINDOF_NO_ATTACK_WARNING #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 4 commits into
base: main
Choose a base branch
from
Open

feat(alarm): Introduce KINDOF_NO_ATTACK_WARNING #2862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 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
293c364
Replace cargo plane name check with NO_ATTACK_WARNING KindOf
githubawn Jul 15, 2026
59f89db
Add unused KindOf padding bit to fix duplicate symbol link error
githubawn Jul 15, 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
2 changes: 2 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 @@ -171,6 +171,8 @@ enum KindOfType CPP_11(: Int)
KINDOF_DEMOTRAP, ///< Added strictly only for disarming purposes. They don't act like mines which have rendering and selection implications!
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 TSH Kindofs
KINDOF_NO_ATTACK_WARNING, ///< does not trigger the under attack radar/EVA warning when damaged (e.g. cargo planes)

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 @@ -1760,7 +1760,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 ) )
TheRadar->tryUnderAttackEvent( this );

}
Expand Down
3 changes: 3 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 @@ -171,6 +171,9 @@ enum KindOfType CPP_11(: Int)
KINDOF_DEMOTRAP, ///< Added strictly only for disarming purposes. They don't act like mines which have rendering and selection implications!
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 TSH Kindofs
KINDOF_NO_ATTACK_WARNING, ///< does not trigger the under attack radar/EVA warning when damaged (e.g. cargo planes)

@xezon xezon Jul 16, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"when taking damage"

I would not mention cargo planes because they are data and original game does not use it.

KINDOF_UNUSED_1, ///< padding to keep KINDOF_COUNT off other BitFlags counts, replace with the next new kindof

@xezon xezon Jul 16, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not understand. Can you explain this more?


KINDOF_COUNT, // total number of kindofs
KINDOF_FIRST = 0,
Expand Down
2 changes: 2 additions & 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,8 @@ const char* const KindOfMaskType::s_bitNameList[] =
"DEMOTRAP",
"CONSERVATIVE_BUILDING",
"IGNORE_DOCKING_BONES",
"NO_ATTACK_WARNING",
"UNUSED_1",

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 @@ -1960,7 +1960,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