diff options
Diffstat (limited to 'src/game/g_active.c')
| -rw-r--r-- | src/game/g_active.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/game/g_active.c b/src/game/g_active.c index 89c45cf7..d423ca74 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -509,8 +509,6 @@ void ClientTimerActions( gentity_t *ent, int msec ) client->ps.stats[ STAT_MISC ] = ammo * LC_TOTAL_CHARGE / 10; } -#define LAUNCH_TIME 2000 - switch( client->ps.weapon ) { case WP_ABUILD: @@ -529,6 +527,13 @@ void ClientTimerActions( gentity_t *ent, int msec ) else client->ps.stats[ STAT_BUILDABLE ] &= ~SB_VALID_TOGGLEBIT; } + + //update build timer + if( client->ps.stats[ STAT_MISC ] > 0 ) + client->ps.stats[ STAT_MISC ] -= 100; + + if( client->ps.stats[ STAT_MISC ] < 0 ) + client->ps.stats[ STAT_MISC ] = 0; break; default: @@ -971,10 +976,6 @@ void ClientThink_real( gentity_t *ent ) { pm.autoWeaponHit[ WP_VENOM ] = CheckVenomAttack( ent ); break; - case WP_GRAB_CLAW: - pm.autoWeaponHit[ WP_GRAB_CLAW ] = CheckGrabAttack( ent ); - break; - case WP_POUNCE: if( client->ps.weaponTime <= 0 ) pm.autoWeaponHit[ WP_POUNCE ] = CheckPounceAttack( ent ); |