From e15a61a5ccddf0a4d69e27bee68468e3c01b43aa Mon Sep 17 00:00:00 2001 From: Flugente Date: Tue, 15 May 2018 23:19:23 +0000 Subject: [PATCH] Fix: in OCTH, damage modifiers for guns are only displayed correctly if the gun fits into a small pocket git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8561 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Weapons.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Tactical/Weapons.cpp b/Tactical/Weapons.cpp index fe0821f1..287c120b 100644 --- a/Tactical/Weapons.cpp +++ b/Tactical/Weapons.cpp @@ -11018,11 +11018,9 @@ UINT8 GetDamage ( OBJECTTYPE *pObj ) // modify by ini values if ( Item[pObj->usItem].usItemClass == IC_GUN ) ubDamage *= gItemSettings.fDamageModifierGun[ Weapon[ pObj->usItem ].ubWeaponType ]; - // HEADROCK HAM 4: I've decided to remove this condition. It makes no friggin sense. - //if (FitsInSmallPocket(pObj) == true) - //{ - ubDamage += GetDamageBonus(pObj); - //} + + ubDamage += GetDamageBonus( pObj ); + ubDamage = (UINT8)GetModifiedGunDamage( ubDamage ); } else @@ -11032,11 +11030,7 @@ UINT8 GetDamage ( OBJECTTYPE *pObj ) if ( Item[pObj->usItem].usItemClass == IC_GUN ) ubDamage *= gItemSettings.fDamageModifierGun[ Weapon[ pObj->usItem ].ubWeaponType ]; - // WTF? Why do only small weapons get their damage bonus?! - if (FitsInSmallPocket(pObj) == true) - { - ubDamage += GetDamageBonus(pObj); - } + ubDamage += GetDamageBonus( pObj ); } return min(255, (UINT8)ubDamage ); }