From b7ac0e7a1dede37a652bfa7ea9317ad4eca1cb94 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Sun, 8 Jan 2017 16:00:35 +0100 Subject: [PATCH] More accuracy fixes --- Source/Shared/WeaponBase.c | 6 +++--- opencs/progs.dat | Bin 161366 -> 161422 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Shared/WeaponBase.c b/Source/Shared/WeaponBase.c index c2f24f7a..52f99f6c 100644 --- a/Source/Shared/WeaponBase.c +++ b/Source/Shared/WeaponBase.c @@ -76,7 +76,7 @@ void OpenCSGunBase_ShotMultiplierHandle( float fShots ) { // This is being triggered in PlayerPreThink after the input void OpenCSGunBase_ShotMultiplierUpdate( void ) { if ( ( self.iShotMultiplier > 0 ) && ( self.fDecreaseShotTime < time ) ) { - self.fDecreaseShotTime = time + 0.1; + self.fDecreaseShotTime = time + wptTable[ self.weapon ].fAttackFinished + 0.01; self.iShotMultiplier--; } } @@ -88,7 +88,7 @@ void OpenCSGunBase_Draw( void ) { } void OpenCSGunBase_AccuracyCalc( void ) { - self.fAccuracy = ( self.iShotMultiplier / wptTable[ self.weapon ].fAccuracyDivisor ) * wptTable[ self.weapon ].iBullets; + self.fAccuracy = ( self.iShotMultiplier / wptTable[ self.weapon ].fAccuracyDivisor ); } // Returns whether or not to play an animation @@ -102,12 +102,12 @@ float OpenCSGunBase_PrimaryFire( void ) { self.flags = self.flags - ( self.flags & FL_SEMI_TOGGLED ); } + OpenCSGunBase_ShotMultiplierHandle( wptTable[ self.weapon ].iBullets ); OpenCSGunBase_AccuracyCalc(); TraceAttack_FireBullets( wptTable[ self.weapon ].iBullets, ( self.origin + self.view_ofs ) ); self.(wptTable[ self.weapon ].iMagfld) -= 1; self.fAttackFinished = time + wptTable[ self.weapon ].fAttackFinished; - OpenCSGunBase_ShotMultiplierHandle( 1 ); Client_SendEvent( self, EV_WEAPON_PRIMARYATTACK ); self.effects = self.effects | EF_MUZZLEFLASH; return TRUE; diff --git a/opencs/progs.dat b/opencs/progs.dat index 456026c6f94fdb55502ea350084d11ad0a89140f..d004dfc86d34b3ea4847555a5a5ff756ea6090e8 100644 GIT binary patch delta 7653 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 delta 7629 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 UBff5dW|NGmLEh|{hEnRk0nr|kT>t<8