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

ChanceToGetThrough: check that weapon exists, additionally initialize usAttackingWeapon, ubTargetID, bDoBurst and bDoAutofire which are used by FireBulletGivenTarget(), replace fake Glock17 with fake Minimi for better range

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8641 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2018-11-10 16:24:30 +00:00
parent 3aa412ac56
commit d8ce2d312d
1 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/LOS.cpp
+39 -13
View File
@@ -6754,45 +6754,71 @@ INT8 FireBulletGivenTarget_NoObjectNoSoldier( UINT16 usItem, UINT8 ammotype, UIN
return( TRUE );
}
INT8 ChanceToGetThrough( SOLDIERTYPE * pFirer, FLOAT dEndX, FLOAT dEndY, FLOAT dEndZ )
INT8 ChanceToGetThrough(SOLDIERTYPE * pFirer, FLOAT dEndX, FLOAT dEndY, FLOAT dEndZ)
{
if ( Item[pFirer->usAttackingWeapon].usItemClass == IC_GUN || Item[ pFirer->usAttackingWeapon ].usItemClass == IC_THROWING_KNIFE || Item[pFirer->usAttackingWeapon].rocketlauncher )
OBJECTTYPE* pObjHand = pFirer->GetUsedWeapon(&(pFirer->inv[pFirer->ubAttackingHand]));
// sevenfm: check that weapon exists!
if (pObjHand->exists() &&
pObjHand->usItem == pFirer->usAttackingWeapon &&
(Item[pFirer->usAttackingWeapon].usItemClass == IC_GUN || Item[pFirer->usAttackingWeapon].usItemClass == IC_THROWING_KNIFE || Item[pFirer->usAttackingWeapon].rocketlauncher))
{
BOOLEAN fBuckShot = FALSE;
OBJECTTYPE* pObjHand = pFirer->GetUsedWeapon( &pFirer->inv[HANDPOS] );
//OBJECTTYPE* pObjHand = pFirer->GetUsedWeapon(&pFirer->inv[HANDPOS]);
// if shotgun, shotgun would have to be in main hand
if ( pObjHand->usItem == pFirer->usAttackingWeapon )
if (pObjHand->usItem == pFirer->usAttackingWeapon)
{
if ( AmmoTypes[ (*pObjHand)[0]->data.gun.ubGunAmmoType].numberOfBullets > 1 )
if (AmmoTypes[(*pObjHand)[0]->data.gun.ubGunAmmoType].numberOfBullets > 1)
{
fBuckShot = TRUE;
}
}
// HEADROCK HAM 4: Changed argument from "hitBy"->"Aperture". Value 0->100.
return( FireBulletGivenTarget( pFirer, dEndX, dEndY, dEndZ, pFirer->usAttackingWeapon, (UsingNewCTHSystem()?100:0), fBuckShot, TRUE ) );
return(FireBulletGivenTarget(pFirer, dEndX, dEndY, dEndZ, pFirer->usAttackingWeapon, (UsingNewCTHSystem() ? 100 : 0), fBuckShot, TRUE));
}
else
{
// fake it
//store the current item then replace it with a Glock 17
OBJECTTYPE oldItemInHand (pFirer->inv[ HANDPOS ]);
OBJECTTYPE oldItemInHand(pFirer->inv[HANDPOS]);
// sevenfm: additionally initialize usAttackingWeapon, ubTargetID, bDoBurst and bDoAutofire which are used by FireBulletGivenTarget()
UINT16 oldAttackingWeapon = pFirer->usAttackingWeapon;
UINT8 oldAttackingHand = pFirer->ubAttackingHand;
UINT8 oldTargetID = pFirer->ubTargetID;
INT8 oldBurst = pFirer->bDoBurst;
INT8 oldAutofire = pFirer->bDoAutofire;
//UINT16 usItem = GLOCK_17;
UINT16 usItem = MINIMI;
//GLOCK_17_ForUseWithLOS is init in InitializeJA2()
if(GLOCK_17_ForUseWithLOS.usItem != GLOCK_17)//dnl ch86 120214
CreateItem(GLOCK_17, 100, &GLOCK_17_ForUseWithLOS);
pFirer->inv[ HANDPOS ] = GLOCK_17_ForUseWithLOS;
pFirer->usAttackingWeapon = GLOCK_17;
if (GLOCK_17_ForUseWithLOS.usItem != usItem)//dnl ch86 120214
CreateItem(usItem, 100, &GLOCK_17_ForUseWithLOS);
pFirer->inv[HANDPOS] = GLOCK_17_ForUseWithLOS;
pFirer->usAttackingWeapon = usItem;
pFirer->ubAttackingHand = HANDPOS;
pFirer->ubTargetID = NOBODY;
pFirer->bDoBurst = 0;
pFirer->bDoAutofire = 0;
// HEADROCK HAM 4: Changed argument from "Hitby"->"Aperture". Value 0->100.
INT8 retVal = FireBulletGivenTarget( pFirer, dEndX, dEndY, dEndZ, GLOCK_17, (UsingNewCTHSystem()?100:0), FALSE, TRUE );
INT8 retVal = FireBulletGivenTarget(pFirer, dEndX, dEndY, dEndZ, usItem, (UsingNewCTHSystem() ? 100 : 0), FALSE, TRUE);
pFirer->inv[ HANDPOS ] = oldItemInHand;
pFirer->inv[HANDPOS] = oldItemInHand;
pFirer->usAttackingWeapon = oldAttackingWeapon;
pFirer->ubAttackingHand = oldAttackingHand;
pFirer->ubTargetID = oldTargetID;
pFirer->bDoBurst = oldBurst;
pFirer->bDoAutofire = oldAutofire;
return retVal;
}
}