summaryrefslogtreecommitdiff
path: root/src/cgame/cg_predict.c
diff options
context:
space:
mode:
authorJeff Kent <jeff@jkent.net>2017-04-13 11:30:00 +0000
committer/dev/humancontroller <devhc@example.com>2017-04-15 17:20:41 +0200
commit26e25997647bfcc8692a2209e5670d4c0119ea8c (patch)
treebe69b2f824a6b749e12849a8b6da32e6ca59d1a0 /src/cgame/cg_predict.c
parentb4c0348da140348f3cbb48cfe544c5682c9e5d34 (diff)
multi-protocol: change the playerState_t and entityState_t structs to the versions in the latest code base
this includes changing how ammo and clips r stored
Diffstat (limited to 'src/cgame/cg_predict.c')
-rw-r--r--src/cgame/cg_predict.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/cgame/cg_predict.c b/src/cgame/cg_predict.c
index 34f00c4..e20eb1d 100644
--- a/src/cgame/cg_predict.c
+++ b/src/cgame/cg_predict.c
@@ -504,11 +504,8 @@ static int CG_IsUnacceptableError( playerState_t *ps, playerState_t *pps )
return 16;
}
- for( i = 0; i < MAX_WEAPONS; i++ )
- {
- if( pps->ammo[ i ] != ps->ammo[ i ] )
- return 18;
- }
+ if( pps->ammo != ps->ammo || pps->clips != ps->clips )
+ return 18;
if( pps->generic1 != ps->generic1 ||
pps->loopSound != ps->loopSound )