diff options
| author | Tim Angus <tim@ngus.net> | 2001-07-18 22:37:36 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2001-07-18 22:37:36 +0000 |
| commit | c4771d2a8707609f9908e4dcc5eb7cbb7c10ed36 (patch) | |
| tree | 829a4463556c275dc5b39c69e6e10e76190b4b2c /src/game/g_active.c | |
| parent | e000aa468822c7201cefa30c48f1d02a0bdef142 (diff) | |
Fiddled alt fire a bit
Diffstat (limited to 'src/game/g_active.c')
| -rw-r--r-- | src/game/g_active.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/game/g_active.c b/src/game/g_active.c index 685ff10c..ca7552a3 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -863,29 +863,22 @@ void ClientThink_real( gentity_t *ent ) { memset (&pm, 0, sizeof(pm)); - if( !( ucmd->buttons & BUTTON_TALK ) && client->ps.weaponTime <= 0 ) + if( !( ucmd->buttons & BUTTON_TALK ) ) //&& client->ps.weaponTime <= 0 ) //TA: erk more server load { - qboolean temp; - switch( client->ps.weapon ) { case WP_VENOM: - pm.autoWeaponHit[ WP_VENOM ] = CheckVenomAttack( ent ); + if( client->ps.weaponTime <= 0 ) + pm.autoWeaponHit[ WP_VENOM ] = CheckVenomAttack( ent ); break; case WP_GRABANDCSAW: - temp = CheckGrabAttack( ent ); - if( !pm.autoWeaponHit[ WP_GRABANDCSAW ] && temp ) - { - //enemy has *just* entered grab range - //only allow grab if attack2 button is UP - if( !( ucmd->buttons & BUTTON_ATTACK2 ) ) - pm.autoWeaponHit[ WP_GRABANDCSAW ] = qtrue; - } + pm.autoWeaponHit[ WP_GRABANDCSAW ] = CheckGrabAttack( ent ); break; case WP_POUNCE: - pm.autoWeaponHit[ WP_POUNCE ] = CheckPounceAttack( ent ); + if( client->ps.weaponTime <= 0 ) + pm.autoWeaponHit[ WP_POUNCE ] = CheckPounceAttack( ent ); break; default: |