From ef5690eecfe614cee99b56d32b3634980b9a0e9d Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Tue, 25 Sep 2007 13:41:22 +0000 Subject: * Replace "powerups" state data with "misc" * Remove ps->ammo[ ] and replace with ps->ammo and ps->clips; this means only one ammo using weapon may be carried at once, but this is the case anyway * No need for BG_(Un)PackAmmoArray anymore, so remove them --- src/cgame/cg_tutorial.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/cgame/cg_tutorial.c') diff --git a/src/cgame/cg_tutorial.c b/src/cgame/cg_tutorial.c index e5fc9eb5..888e9e1a 100644 --- a/src/cgame/cg_tutorial.c +++ b/src/cgame/cg_tutorial.c @@ -396,7 +396,6 @@ CG_HumanText static void CG_HumanText( char *text, playerState_t *ps ) { char *name; - int ammo, clips; upgrade_t upgrade = UP_NONE; if( cg.weaponSelect <= 32 ) @@ -407,9 +406,7 @@ static void CG_HumanText( char *text, playerState_t *ps ) upgrade = cg.weaponSelect - 32; } - BG_UnpackAmmoArray( ps->weapon, ps->ammo, ps->powerups, &ammo, &clips ); - - if( !ammo && !clips && !BG_FindInfinteAmmoForWeapon( ps->weapon ) ) + if( !ps->ammo && !ps->clips && !BG_FindInfinteAmmoForWeapon( ps->weapon ) ) { //no ammo switch( ps->weapon ) -- cgit