From a1395a3c1a640777c60f93ec3953a061a64143c3 Mon Sep 17 00:00:00 2001
From: Christopher Schwarz <lakitu7@gmail.com>
Date: Sun, 8 Nov 2009 07:35:13 +0000
Subject: * Fix the mara+ zap repeat-rate being infinitely long if you kept
 mashing the button before the timer was up   - If you've been unable to hit
 anything with the zap for mysterious reasons, this was probably why * Remove
 some vestigal code from previous zap rewrites that was causing the above

---
 src/game/g_active.c | 33 ---------------------------------
 src/game/g_local.h  |  5 -----
 2 files changed, 38 deletions(-)

(limited to 'src/game')

diff --git a/src/game/g_active.c b/src/game/g_active.c
index 4bd1c30e..e3c6eaa5 100644
--- a/src/game/g_active.c
+++ b/src/game/g_active.c
@@ -1207,37 +1207,6 @@ static void G_UnlaggedDetectCollisions( gentity_t *ent )
   G_UnlaggedOff( );
 }
 
-/*
-==============
-G_CheckZap
-==============
-*/
-static void G_CheckZap( gentity_t *ent )
-{
-  int i;
-
-  if( !ent->zapping )
-  {
-    // clear out established targets
-    for( i = 0; i < LEVEL2_AREAZAP_MAX_TARGETS; i++ )
-    {
-      ent->zapTargets[ i ] = -1;
-    }
-    ent->zapDmg = 0.0f;
-  }
-  ent->wasZapping = ent->zapping;
-  ent->zapping = qfalse;
-
-  if( ent->client->ps.weapon == WP_ALEVEL2_UPG &&
-    ( ent->client->pers.cmd.buttons & BUTTON_ATTACK2 ) )
-  {
-    ent->zapping = qtrue;
-  }
-
-  if( ent->wasZapping && !ent->zapping )
-    ent->client->ps.weaponTime = LEVEL2_AREAZAP_REPEAT;
-}
-
 /*
 ==============
 ClientThink
@@ -1639,8 +1608,6 @@ void ClientThink_real( gentity_t *ent )
   // touch other objects
   ClientImpacts( ent, &pm );
 
-  G_CheckZap( ent );
-
   // execute client events
   ClientEvents( ent, oldEventSequence );
 
diff --git a/src/game/g_local.h b/src/game/g_local.h
index 75dc691e..2fbe4238 100644
--- a/src/game/g_local.h
+++ b/src/game/g_local.h
@@ -241,11 +241,6 @@ struct gentity_s
   int               lastDamageTime;
   int               nextRegenTime;
 
-  qboolean          zapping;                        // adv maurader is zapping
-  qboolean          wasZapping;                     // adv maurader was zapping
-  int               zapTargets[ LEVEL2_AREAZAP_MAX_TARGETS ];
-  float             zapDmg;                         // keep track of damage
-
   qboolean          ownerClear;                     // used for missle tracking
 
   qboolean          pointAgainstWorld;              // don't use the bbox for map collisions
-- 
cgit