summaryrefslogtreecommitdiff
path: root/src/game/g_active.c
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2001-06-30 03:00:37 +0000
committerTim Angus <tim@ngus.net>2001-06-30 03:00:37 +0000
commit5420c537abb7aa5c27b168a234a956cf6afec47d (patch)
tree7efea8f5736feb9859f619c729e98cb10636b9c3 /src/game/g_active.c
parent7cdc992e6cb562b43c0ae55dd1b39f26d98b5dea (diff)
Fiddled WP_VENOM to auto attack
Diffstat (limited to 'src/game/g_active.c')
-rw-r--r--src/game/g_active.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/src/game/g_active.c b/src/game/g_active.c
index 246c68fb..66c9c279 100644
--- a/src/game/g_active.c
+++ b/src/game/g_active.c
@@ -822,14 +822,18 @@ void ClientThink_real( gentity_t *ent ) {
memset (&pm, 0, sizeof(pm));
- //TA: gauntlet is a NULL weapon to be given to builder classes
- // check for the hit-scan gauntlet, don't let the action
- // go through as an attack unless it actually hits something
- /*if ( client->ps.weapon == WP_GAUNTLET && !( ucmd->buttons & BUTTON_TALK ) &&
- ( ucmd->buttons & BUTTON_ATTACK ) && client->ps.weaponTime <= 0 ) {
- pm.gauntletHit = CheckGauntletAttack( ent );
- }*/
- pm.gauntletHit = qfalse;
+ if( !( ucmd->buttons & BUTTON_TALK ) && client->ps.weaponTime <= 0 )
+ {
+ switch( client->ps.weapon )
+ {
+ case WP_VENOM:
+ pm.autoWeaponHit[ WP_VENOM ] = CheckVenomAttack( ent );
+ break;
+
+ default:
+ break;
+ }
+ }
if ( ent->flags & FL_FORCE_GESTURE ) {
ent->flags &= ~FL_FORCE_GESTURE;