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/game/g_misc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/game/g_misc.c') diff --git a/src/game/g_misc.c b/src/game/g_misc.c index 5352dbe3..5c551104 100644 --- a/src/game/g_misc.c +++ b/src/game/g_misc.c @@ -163,10 +163,10 @@ void locateCamera( gentity_t *ent ) if( owner->spawnflags & 4 ) { // set to 0 for no rotation at all - ent->s.powerups = 0; + ent->s.misc = 0; } else - ent->s.powerups = 1; + ent->s.misc = 1; // clientNum holds the rotate offset ent->s.clientNum = owner->s.clientNum; @@ -327,7 +327,7 @@ Spawn function for anim model */ void SP_misc_anim_model( gentity_t *self ) { - self->s.powerups = (int)self->animation[ 0 ]; + self->s.misc = (int)self->animation[ 0 ]; self->s.weapon = (int)self->animation[ 1 ]; self->s.torsoAnim = (int)self->animation[ 2 ]; self->s.legsAnim = (int)self->animation[ 3 ]; -- cgit