From 6b6700ce96b9642a51d4c3b9a9edaec68947a276 Mon Sep 17 00:00:00 2001 From: Wanne Date: Mon, 13 Aug 2007 18:08:41 +0000 Subject: [PATCH] - bugfix: HE Ammo Bug (thx to Callahan) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1195 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Weapons.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Tactical/Weapons.cpp b/Tactical/Weapons.cpp index d8485d22..d36a241d 100644 --- a/Tactical/Weapons.cpp +++ b/Tactical/Weapons.cpp @@ -2937,7 +2937,9 @@ void WeaponHit( UINT16 usSoldierID, UINT16 usWeaponIndex, INT16 sDamage, INT16 s MakeNoise( ubAttackerID, pTargetSoldier->sGridNo, pTargetSoldier->bLevel, gpWorldLevelData[pTargetSoldier->sGridNo].ubTerrainID, Weapon[ usWeaponIndex ].ubHitVolume, NOISE_BULLET_IMPACT ); - if ( EXPLOSIVE_GUN( usWeaponIndex ) ) + // CALLAHAN START BUGFIX + if ( EXPLOSIVE_GUN( usWeaponIndex ) || AmmoTypes[pSoldier->inv[pSoldier->ubAttackingHand ].ubGunAmmoType].explosionSize > 1) + // CALLAHAN END BUGFIX { // Reduce attacker count! //TODO: Madd --- I don't think this code will ever get called for the HE ammo -- the EXPLOSIVE_GUN check filters out regular guns