1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: in OCTH, damage modifiers for guns are only displayed correctly if the gun fits into a small pocket

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8561 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-05-15 23:19:23 +00:00
parent 100eea196b
commit e15a61a5cc
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Weapons.cpp
+4 -10
View File
@@ -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 );
}