Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
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
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
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)
KINDOF_UNUSED_1, ///< padding to keep KINDOF_COUNT off other BitFlags counts, replace with the next new kindof

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
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
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