Skip to content

bugfix(gameplay): Prevent countermeasures from destroyed units #425

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

bugfix(gameplay): Prevent countermeasures from destroyed units #425

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
5 changes: 4 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1174,7 +1174,7 @@ UnsignedInt WeaponTemplate::fireWeaponTemplate
}

//If we're launching a missile at a unit with valid countermeasures, then communicate it
if( projectile->isKindOf( KINDOF_SMALL_MISSILE ) && victimObj && victimObj->hasCountermeasures() )
if( projectile->isKindOf( KINDOF_SMALL_MISSILE ) && victimObj && !victimObj->isDestroyed() && victimObj->hasCountermeasures() )
{
const AIUpdateInterface *ai = victimObj->getAI();
//Only allow jets not currently supersonic to launch countermeasures
Expand Down Expand Up @@ -3647,4 +3647,7 @@ void WeaponBonusSet::appendBonuses(WeaponBonusConditionFlags flags, WeaponBonus&
}






Expand Down
1 change: 1 addition & 0 deletions tmp/weapon_patch_check.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
placeholder
Loading