Fix for the "CONT" that won't go away

Fix points calculation in BaseAPsToShootOrStab
Tweaks to inventory, soldier, and merc profile structs
Fix for divide by 0 in CalcBestShot


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1199 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Overhaul
2007-08-14 07:48:45 +00:00
parent 6b6700ce96
commit c9fb501033
7 changed files with 69 additions and 39 deletions
+2 -2
View File
@@ -1203,7 +1203,7 @@ UINT8 BaseAPsToShootOrStab( INT8 bAPs, INT8 bAimSkill, OBJECTTYPE * pObj )
// Their info is an array of item status, not weapon info, and they don't repeat
// fire anyway.
rof = Weapon[ pObj->usItem ].ubShotsPer4Turns;
if (Item[ pObj->usItem ].ubPerPocket == 0)
if (Item[ pObj->usItem ].ubPerPocket <= 1)
{
rof += GetRateOfFireBonus(pObj);
}
@@ -1217,7 +1217,7 @@ UINT8 BaseAPsToShootOrStab( INT8 bAPs, INT8 bAimSkill, OBJECTTYPE * pObj )
// Snap: Refactored the formula to reduce the number of integer divisions
Top = 8 * bAPs;
if (Item[ pObj->usItem ].ubPerPocket == 0)
if (Item[ pObj->usItem ].ubPerPocket <= 1)
{
Top *= ( 100 - GetPercentAPReduction(pObj) );
}