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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c
index 4da6205..e2d0183 100644
--- a/src/game/g_weapon.c
+++ b/src/game/g_weapon.c
@@ -97,7 +97,7 @@ void G_GiveClientMaxAmmo( gentity_t *ent, qboolean buyingEnergyAmmo )
     if( BG_InventoryContainsWeapon( i, ent->client->ps.stats ) &&
         weaponType && !BG_FindInfinteAmmoForWeapon( i ) &&
         !BG_WeaponIsFull( i, ent->client->ps.stats,
-          ent->client->ps.ammo, ent->client->ps.powerups ) )
+          ent->client->ps.ammo, ent->client->ps.clips ) )
     {
       BG_FindAmmoForWeapon( i, &maxAmmo, &maxClips );
 
@@ -109,8 +109,8 @@ void G_GiveClientMaxAmmo( gentity_t *ent, qboolean buyingEnergyAmmo )
           maxAmmo = (int)( (float)maxAmmo * BATTPACK_MODIFIER );
       }
 
-      BG_PackAmmoArray( i, ent->client->ps.ammo, ent->client->ps.powerups,
-                        maxAmmo, maxClips );
+      ent->client->ps.ammo = maxAmmo;
+      ent->client->ps.clips = maxClips;
 
       restoredAmmo = qtrue;
     }