From ebd43d72d1af22fcde4b9857fb226cefab9fcdbf Mon Sep 17 00:00:00 2001 From: /dev/humancontroller Date: Sat, 15 Apr 2017 08:17:14 +0200 Subject: multi-protocol: also update the cQVM-specific ammo&clips code --- src/game/g_main.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/game/g_main.c b/src/game/g_main.c index b4f8316..cb3ef01 100644 --- a/src/game/g_main.c +++ b/src/game/g_main.c @@ -3143,26 +3143,21 @@ static void G_CheckVampireDeathBuildables( void ) if( ent->client->pers.teamSelection == PTE_HUMANS ) { - int ammo, clips, maxClips, maxAmmo; + int maxClips, maxAmmo; BG_FindAmmoForWeapon( ent->client->ps.weapon, &maxAmmo, &maxClips ); - BG_UnpackAmmoArray( ent->client->ps.weapon, ent->client->ps.ammo, - ent->client->ps.powerups, &ammo, &clips ); if( maxClips ) { - if( clips < maxClips ) - clips++; + if( ent->client->ps.clips < maxClips ) + ent->client->ps.clips++; } else { - ammo += maxAmmo / 5; - if( ammo > maxAmmo ) - ammo = maxAmmo; + ent->client->ps.ammo += maxAmmo / 5; + if( ent->client->ps.ammo > maxAmmo ) + ent->client->ps.ammo = maxAmmo; } - - BG_PackAmmoArray( ent->client->ps.weapon, ent->client->ps.ammo, - ent->client->ps.powerups, ammo, clips ); } } } -- cgit