From 5420c537abb7aa5c27b168a234a956cf6afec47d Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Sat, 30 Jun 2001 03:00:37 +0000
Subject: Fiddled WP_VENOM to auto attack

---
 src/cgame/cg_predict.c | 5 +++--
 src/cgame/cg_weapons.c | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/cgame')

diff --git a/src/cgame/cg_predict.c b/src/cgame/cg_predict.c
index 6ded046c..602efa0b 100644
--- a/src/cgame/cg_predict.c
+++ b/src/cgame/cg_predict.c
@@ -399,7 +399,7 @@ to ease the jerk.
 =================
 */
 void CG_PredictPlayerState( void ) {
-  int     cmdNum, current;
+  int     cmdNum, current, i;
   playerState_t oldPlayerState;
   qboolean  moved;
   usercmd_t oldestCmd;
@@ -564,7 +564,8 @@ void CG_PredictPlayerState( void ) {
 
     // don't predict gauntlet firing, which is only supposed to happen
     // when it actually inflicts damage
-    cg_pmove.gauntletHit = qfalse;
+    for( i = WP_NONE + 1; i < WP_NUM_WEAPONS; i++ )
+      cg_pmove.autoWeaponHit[ i ] = qfalse;
 
     if ( cg_pmove.pmove_fixed ) {
       cg_pmove.cmd.serverTime = ((cg_pmove.cmd.serverTime + pmove_msec.integer-1) / pmove_msec.integer) * pmove_msec.integer;
diff --git a/src/cgame/cg_weapons.c b/src/cgame/cg_weapons.c
index cc1f835e..470d1603 100644
--- a/src/cgame/cg_weapons.c
+++ b/src/cgame/cg_weapons.c
@@ -1200,7 +1200,7 @@ void CG_DrawWeaponSelect( void ) {
   x = 10;
   y = 10;
 
-  for ( i = WP_GAUNTLET; i < WP_NUM_WEAPONS; i++ ) {
+  for ( i = WP_NONE + 1; i < WP_NUM_WEAPONS; i++ ) {
     if( !BG_gotWeapon( i, cg.snap->ps.stats ) )
       continue;
 
-- 
cgit