Skip to content

bugfix: Undetected mines can now be approached when using a disarm weapon #1883

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

bugfix: Undetected mines can now be approached when using a disarm weapon #1883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2596,7 +2596,15 @@ StateReturnType AIAttackApproachTargetState::updateInternal()
{
if( victim->testStatus( OBJECT_STATUS_STEALTHED ) && !victim->testStatus( OBJECT_STATUS_DETECTED ) )
{
#if RETAIL_COMPATIBLE_CRC
return STATE_FAILURE; // If obj is stealthed, can no longer approach.
#else
Bool isTargetingMine = weapon && weapon->getDamageType() == DAMAGE_DISARM &&
(victim->isKindOf(KINDOF_MINE));

if (!isTargetingMine)
return STATE_FAILURE; // If obj is stealthed, can no longer approach - unless we're targeting a mine!
#endif
}
ai->setCurrentVictim(victim);
// Attacking an object.
Expand Down
8 changes: 8 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2682,7 +2682,15 @@ StateReturnType AIAttackApproachTargetState::updateInternal()
}
if( victim->testStatus( OBJECT_STATUS_STEALTHED ) && !victim->testStatus( OBJECT_STATUS_DETECTED ) && !victim->testStatus( OBJECT_STATUS_DISGUISED ) )
{
#if RETAIL_COMPATIBLE_CRC
return STATE_FAILURE; // If obj is stealthed, can no longer approach.
#else
Bool isTargetingMine = weapon && weapon->getDamageType() == DAMAGE_DISARM &&
(victim->isKindOf(KINDOF_MINE) || victim->isKindOf(KINDOF_BOOBY_TRAP) || victim->isKindOf(KINDOF_DEMOTRAP));

if (!isTargetingMine)
return STATE_FAILURE; // If obj is stealthed, can no longer approach - unless we're targeting a mine!
#endif
}
ai->setCurrentVictim(victim);
// Attacking an object.
Expand Down
Loading