FWGS
/
hlsdk-xash3d
mirror of https://github.com/FWGS/hlsdk-xash3d
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove TabulateAmmo function calls.

This commit is contained in:
Night Owl 2018-12-09 13:29:13 +05:00
parent a7c95a350b
commit 5c8a73894b
3 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/player.cpp
View File

@ -1120,25 +1120,6 @@ void CBasePlayer::SetAnimation( PLAYER_ANIM playerAnim )
ResetSequenceInfo(); ResetSequenceInfo();
} }
/*
===========
TabulateAmmo
This function is used to find and store
all the ammo we have into the ammo vars.
============
*/
void CBasePlayer::TabulateAmmo()
{
ammo_9mm = AmmoInventory( GetAmmoIndex( "9mm" ) );
ammo_357 = AmmoInventory( GetAmmoIndex( "357" ) );
ammo_argrens = AmmoInventory( GetAmmoIndex( "ARgrenades" ) );
ammo_bolts = AmmoInventory( GetAmmoIndex( "bolts" ) );
ammo_buckshot = AmmoInventory( GetAmmoIndex( "buckshot" ) );
ammo_rockets = AmmoInventory( GetAmmoIndex( "rockets" ) );
ammo_uranium = AmmoInventory( GetAmmoIndex( "uranium" ) );
ammo_hornets = AmmoInventory( GetAmmoIndex( "Hornets" ) );
}
/* /*
=========== ===========
WaterMove WaterMove
@ -3769,8 +3750,6 @@ int CBasePlayer::GiveAmmo( int iCount, const char *szName, int iMax )
MESSAGE_END(); MESSAGE_END();
} }
TabulateAmmo();
return i; return i;
} }

2
dlls/player.h
View File

@ -305,8 +305,6 @@ public:
void SetCustomDecalFrames( int nFrames ); void SetCustomDecalFrames( int nFrames );
int GetCustomDecalFrames( void ); int GetCustomDecalFrames( void );
void TabulateAmmo( void );
Vector m_vecLastViewAngles; Vector m_vecLastViewAngles;
float m_flStartCharge; float m_flStartCharge;

5
dlls/weapons.cpp
View File

@ -613,8 +613,6 @@ void CBasePlayerWeapon::ItemPostFrame( void )
m_iClip += j; m_iClip += j;
m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] -= j; m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] -= j;
m_pPlayer->TabulateAmmo();
m_fInReload = FALSE; m_fInReload = FALSE;
} }
@ -630,7 +628,6 @@ void CBasePlayerWeapon::ItemPostFrame( void )
m_fFireOnEmpty = TRUE; m_fFireOnEmpty = TRUE;
} }
m_pPlayer->TabulateAmmo();
SecondaryAttack(); SecondaryAttack();
m_pPlayer->pev->button &= ~IN_ATTACK2; m_pPlayer->pev->button &= ~IN_ATTACK2;
} }
@ -641,7 +638,6 @@ void CBasePlayerWeapon::ItemPostFrame( void )
m_fFireOnEmpty = TRUE; m_fFireOnEmpty = TRUE;
} }
m_pPlayer->TabulateAmmo();
PrimaryAttack(); PrimaryAttack();
} }
else if( m_pPlayer->pev->button & IN_RELOAD && iMaxClip() != WEAPON_NOCLIP && !m_fInReload ) else if( m_pPlayer->pev->button & IN_RELOAD && iMaxClip() != WEAPON_NOCLIP && !m_fInReload )
@ -946,7 +942,6 @@ BOOL CBasePlayerWeapon::DefaultDeploy( const char *szViewModel, const char *szWe
if( !CanDeploy() ) if( !CanDeploy() )
return FALSE; return FALSE;
m_pPlayer->TabulateAmmo();
m_pPlayer->pev->viewmodel = MAKE_STRING( szViewModel ); m_pPlayer->pev->viewmodel = MAKE_STRING( szViewModel );
m_pPlayer->pev->weaponmodel = MAKE_STRING( szWeaponModel ); m_pPlayer->pev->weaponmodel = MAKE_STRING( szWeaponModel );
strcpy( m_pPlayer->m_szAnimExtention, szAnimExt ); strcpy( m_pPlayer->m_szAnimExtention, szAnimExt );