From aadd29b320630c06495ce6fe80c6993c1fafa179 Mon Sep 17 00:00:00 2001 From: Wanne Date: Tue, 24 Apr 2012 09:05:23 +0000 Subject: [PATCH] - Bugfix: One shot LAWs do not explode on a direct target hit o This bug was introduced when merging HAM 5 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5222 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Weapons.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tactical/Weapons.cpp b/Tactical/Weapons.cpp index 2666e14e..eaf76322 100644 --- a/Tactical/Weapons.cpp +++ b/Tactical/Weapons.cpp @@ -4045,7 +4045,7 @@ void WeaponHit( UINT16 usSoldierID, UINT16 usWeaponIndex, INT16 sDamage, INT16 s // CALLAHAN START BUGFIX // Provisions for Fragments, which are resulting from a different weapon than the one we are holding in our hand. UINT8 ubAmmoType = 0; - if ( pObj->usItem == usWeaponIndex ) + if ( pObj->usItem == usWeaponIndex || EXPLOSIVE_GUN( usWeaponIndex )) // WANNE: This fixes the bug, that ONE shot LAWs do not explode on a direct target hit! { ubAmmoType = (*pObj)[0]->data.gun.ubGunAmmoType; }