From 536cc1c2831a93a695db9962bf0665bf575ccb8e Mon Sep 17 00:00:00 2001 From: Paradox460 Date: Tue, 26 Feb 2008 00:18:15 +0000 Subject: [PATCH] Added fixes for !denyweapon --- src/game/g_admin.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/game/g_admin.c b/src/game/g_admin.c index 7f894aa..9264e48 100644 --- a/src/game/g_admin.c +++ b/src/game/g_admin.c @@ -2731,7 +2731,7 @@ qboolean G_admin_denyweapon( gentity_t *ent, int skiparg ) if( weapon < WP_PAIN_SAW || weapon > WP_GRENADE ) class = BG_FindClassNumForName( buffer ); if( ( weapon < WP_PAIN_SAW || weapon > WP_GRENADE ) && - ( class < PCL_ALIEN_LEVEL0 || class > PCL_ALIEN_LEVEL4 ) ) + ( class < PCL_ALIEN_LEVEL1 || class > PCL_ALIEN_LEVEL4 ) ) { ADMP( va( "^3!%s: ^7unknown weapon or class\n", cmd ) ); return qfalse; @@ -2797,7 +2797,7 @@ qboolean G_admin_denyweapon( gentity_t *ent, int skiparg ) } vic->client->pers.denyAlienClasses |= flag; if( vic->client->pers.teamSelection == PTE_ALIENS && - ent->client->pers.classSelection == class ) + vic->client->pers.classSelection == class ) { vec3_t infestOrigin; short cost; @@ -2806,12 +2806,12 @@ qboolean G_admin_denyweapon( gentity_t *ent, int skiparg ) vic->client->pers.evolveHealthFraction = (float)vic->client->ps.stats[ STAT_HEALTH ] / (float)BG_FindHealthForClass( class ); - if( ent->client->pers.evolveHealthFraction < 0.0f ) - ent->client->pers.evolveHealthFraction = 0.0f; - else if( ent->client->pers.evolveHealthFraction > 1.0f ) - ent->client->pers.evolveHealthFraction = 1.0f; + if( vic->client->pers.evolveHealthFraction < 0.0f ) + vic->client->pers.evolveHealthFraction = 0.0f; + else if( vic->client->pers.evolveHealthFraction > 1.0f ) + vic->client->pers.evolveHealthFraction = 1.0f; - ent->client->pers.classSelection = PCL_ALIEN_LEVEL0; + vic->client->pers.classSelection = PCL_ALIEN_LEVEL0; cost = BG_ClassCanEvolveFromTo( PCL_ALIEN_LEVEL0, class, 9, 0 ); if( cost < 0 ) cost = 0; G_AddCreditToClient( vic->client, cost, qfalse );