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

some fixes for NCTH recoil handling

Browse Source 
- first bullet will now always return 0 recoil
- following bullets should now count correctly depending on single or dual wielding shots

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6564 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
silversurfer
2013-11-07 15:13:05 +00:00
parent a05bb3ad5b
commit d054395b59
2 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Items.cpp
+4 -2
View File
@@ -10444,8 +10444,10 @@ void GetRecoil( SOLDIERTYPE *pSoldier, OBJECTTYPE *pObj, INT8 *bRecoilX, INT8 *b
OBJECTTYPE* pObjUsed = pSoldier->GetUsedWeapon(pObj);
OBJECTTYPE* pObjUsedInHand = pSoldier->GetUsedWeapon( &(pSoldier->inv[HANDPOS]) );
//if (ubNumBullet < 2)
if (ubNumBullet < Weapon[pObjUsed->usItem].ubRecoilDelay)
// silversurfer: The first bullet should never return recoil. If function CalcPreRecoilOffset( ) in LOS.cpp wants to know
// what recoil to expect for the second bullet in the volley it should ask for the second bullet and does so from now on.
// ubRecoilDelay is 0 for almost all weapons so we need to have a failsafe here for the first bullet.
if (ubNumBullet < 2 || ubNumBullet <= Weapon[pObjUsed->usItem].ubRecoilDelay)
{
// The first bullet in a volley never has recoil - it hasn't "set in" yet. Only the second+ bullets
// will have any recoil.
Tactical/LOS.cpp
+32 -9
View File
@@ -8835,7 +8835,8 @@ void CalcPreRecoilOffset( SOLDIERTYPE *pShooter, OBJECTTYPE *pWeapon, FLOAT *dMu
INT8 bGunRecoilY;
// Get the gun's recoil values for our first bullet.
GetRecoil( pShooter, pWeapon, &bGunRecoilX, &bGunRecoilY, 1 );
// silversurfer: The first bullet will never be affected by recoil so ask for number 2 instead.
GetRecoil( pShooter, pWeapon, &bGunRecoilX, &bGunRecoilY, 2 );
// Calculate the Distance Ratio for later use.
FLOAT dDistanceRatio = (FLOAT)uiRange / (FLOAT)gGameCTHConstants.NORMAL_RECOIL_DISTANCE;
@@ -8893,8 +8894,7 @@ void CalcPreRecoilOffset( SOLDIERTYPE *pShooter, OBJECTTYPE *pWeapon, FLOAT *dMu
// We can adjust by up to one recoil-length away - not much, but helpful.
// Randomly determine whether the soldier has compensated by moving his muzzle.
/*
if (PreRandom(100) < uiPreRecoilAbility)
/* if (PreRandom(100) < uiPreRecoilAbility)
{
// The soldier is smart enough to compensate for recoil by not aiming for the center of the target.
// He will attempt to adjust his aim by one recoil's length, causing the second bullet to impact
@@ -8922,8 +8922,7 @@ void CalcPreRecoilOffset( SOLDIERTYPE *pShooter, OBJECTTYPE *pWeapon, FLOAT *dMu
// Set final muzzle compensation
dOffsetY = dIdealOffsetY + (dError * bErrorDirection);
}
*/
*/
// Randomly determine whether the soldier has compensated by applying counter-force.
if (PreRandom(100) < uiPreRecoilAbility)
{
@@ -9039,9 +9038,21 @@ void CalcRecoilOffset( SOLDIERTYPE *pShooter, FLOAT *dMuzzleOffsetX, FLOAT *dMuz
INT8 bGunRecoilY;
if( fSecondHandBurst )
GetRecoil( pShooter, pWeapon, &bGunRecoilX, &bGunRecoilY, (pShooter->bDoBurst/2-2) );
GetRecoil( pShooter, pWeapon, &bGunRecoilX, &bGunRecoilY, (pShooter->bDoBurst/2) );
else
GetRecoil( pShooter, pWeapon, &bGunRecoilX, &bGunRecoilY, pShooter->bDoBurst-1 );
{
// silversurfer: We need to count differently for primary weapon depending on single or dual wielding guns.
// For single wielding bDoBurst counts 1, 2, 3, 4, 5... because we fire only one gun.
// For dual wielding the primary counts 1, 3, 5, 7... and the secondary gets the even numbers.
if ( pShooter->IsValidSecondHandBurst() )
{
GetRecoil( pShooter, pWeapon, &bGunRecoilX, &bGunRecoilY, (pShooter->bDoBurst / 2 + pShooter->bDoBurst % 2) );
}
else
{
GetRecoil( pShooter, pWeapon, &bGunRecoilX, &bGunRecoilY, pShooter->bDoBurst );
}
}
// If no recoil, then we shouldn't be here anyway.
if(bGunRecoilX == 0 && bGunRecoilY == 0)
@@ -9455,9 +9466,21 @@ FLOAT CalcCounterForceChange( SOLDIERTYPE * pShooter, UINT32 uiCounterForceAccur
// fire that many bullets?
UINT32 uiRoundsRemaining;
if ( pShooter->ubAttackingHand == SECONDHANDPOS && pShooter->IsValidSecondHandBurst() )
uiRoundsRemaining = uiIntendedBullets - (pShooter->bDoBurst/2 - 2);
uiRoundsRemaining = uiIntendedBullets - (pShooter->bDoBurst/2);
else
uiRoundsRemaining = uiIntendedBullets - (pShooter->bDoBurst - 1);
{
// silversurfer: We need to count differently for primary weapon depending on single or dual wielding guns.
// For single wielding bDoBurst counts 1, 2, 3, 4, 5... because we fire only one gun.
// For dual wielding the primary counts 1, 3, 5, 7... and the secondary gets the even numbers.
if ( pShooter->IsValidSecondHandBurst() )
{
uiRoundsRemaining = uiIntendedBullets - (pShooter->bDoBurst / 2 + pShooter->bDoBurst % 2);
}
else
{
uiRoundsRemaining = uiIntendedBullets - pShooter->bDoBurst;
}
}
BOOLEAN fEnoughBullets = true;
if (uiRoundsRemaining < uiStepsToReachTargetWhileDecelerating)