summaryrefslogtreecommitdiff
path: root/src/cgame
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/cgame
parent7cdc992e6cb562b43c0ae55dd1b39f26d98b5dea (diff)
Fiddled WP_VENOM to auto attack
Diffstat (limited to 'src/cgame')
-rw-r--r--src/cgame/cg_predict.c5
-rw-r--r--src/cgame/cg_weapons.c2
2 files changed, 4 insertions, 3 deletions
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;