1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix to stackable throwables:

Browse Source 
Stop assertion failure for stack of 6 throwables.  
Report correct damage and AP for stacked throwables.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1036 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Overhaul
2007-07-09 11:06:57 +00:00
parent d318885593
commit ec4d1f6e24
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Weapons.cpp
+5 -1
View File
@@ -5690,7 +5690,11 @@ UINT8 GetDamage ( OBJECTTYPE *pObj )
}
else
{
UINT8 ubDamage = Weapon[ pObj->usItem ].ubImpact + GetDamageBonus(pObj);
UINT8 ubDamage = Weapon[ pObj->usItem ].ubImpact;
if (Item[ pObj->usItem ].ubPerPocket == 0)
{
ubDamage += GetDamageBonus(pObj);
}
return min(255, (UINT8)( (ubDamage) + ( (double)ubDamage / 100) * gGameExternalOptions.ubGunDamageMultiplier ) );
}
}