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

Added helper functions to easier determine gun stats

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9158 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2021-08-27 20:48:19 +00:00
parent 99142603cb
commit a93e9b4a9c
4 changed files with 75 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Weapons.cpp
+12 -7
View File
@@ -10740,18 +10740,18 @@ BOOLEAN WasPrevBulletATracer( SOLDIERTYPE *pSoldier, OBJECTTYPE *pWeapon )
}
}
UINT8 GetAutofireShotsPerFiveAPs( OBJECTTYPE *pObj )
UINT8 GetAutofireShotsPerFiveAPs( UINT16 usItem )
{
// DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("GetAutofireShotsPerFiveAPs"));
// HEADROCK HAM B2.6: Added overall modifier
if (Weapon[ pObj->usItem ].bAutofireShotsPerFiveAP > 0)
if (Weapon[ usItem ].bAutofireShotsPerFiveAP > 0)
{
UINT8 usAutoFireShots = Weapon[ pObj->usItem ].bAutofireShotsPerFiveAP;
UINT8 usAutoFireShots = Weapon[ usItem ].bAutofireShotsPerFiveAP;
// modify by ini values
if ( Item[ pObj->usItem ].usItemClass == IC_GUN )
usAutoFireShots *= gItemSettings.fAFShotsPer5APModifierGun[ Weapon[ pObj->usItem ].ubWeaponType ];
if ( Item[ usItem ].usItemClass == IC_GUN )
usAutoFireShots *= gItemSettings.fAFShotsPer5APModifierGun[ Weapon[ usItem ].ubWeaponType ];
// WANNE: Fix by Headrock
// Weapons shouldn't ever lose their Bp5AP due to this modifier.
@@ -10759,10 +10759,15 @@ UINT8 GetAutofireShotsPerFiveAPs( OBJECTTYPE *pObj )
//return __max((Weapon[ pObj->usItem ].bAutofireShotsPerFiveAP + gGameExternalOptions.bAutofireBulletsPer5APModifier), 0);
}
else
return 0;
return 0;
}
UINT8 GetAutofireShotsPerFiveAPs( OBJECTTYPE *pObj )
{
return GetAutofireShotsPerFiveAPs( pObj->usItem );
}
UINT16 GetMagSize( OBJECTTYPE *pObj, UINT8 subObject )
{
// DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("GetMagSize"));