From 26e25997647bfcc8692a2209e5670d4c0119ea8c Mon Sep 17 00:00:00 2001
From: Jeff Kent <jeff@jkent.net>
Date: Thu, 13 Apr 2017 11:30:00 +0000
Subject: 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
---
 src/cgame/cg_predict.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/cgame/cg_predict.c')

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 )
-- 
cgit