diff options
| author | Christopher Schwarz <lakitu7@gmail.com> | 2009-11-08 07:35:13 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:17:18 +0000 |
| commit | a1395a3c1a640777c60f93ec3953a061a64143c3 (patch) | |
| tree | 34e6d24644e4d30fa4685346d57beaa3d6dc76e0 | |
| parent | 3a45e79eb384cdbcf6ff4c4b9b438a386640ba84 (diff) | |
* 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
| -rw-r--r-- | src/game/g_active.c | 33 | ||||
| -rw-r--r-- | src/game/g_local.h | 5 |
2 files changed, 0 insertions, 38 deletions
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 @@ -1209,37 +1209,6 @@ static void G_UnlaggedDetectCollisions( gentity_t *ent ) /* ============== -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 This will be called once for each client frame, which will @@ -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 |