summaryrefslogtreecommitdiff
path: root/src/game/g_weapon.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/g_weapon.c')
-rw-r--r--src/game/g_weapon.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c
index b150d65f..72bd730c 100644
--- a/src/game/g_weapon.c
+++ b/src/game/g_weapon.c
@@ -53,7 +53,7 @@ void G_ForceWeaponChange( gentity_t *ent, weapon_t weapon )
!BG_InventoryContainsWeapon( weapon, ps->stats ) )
{
// switch to the first non blaster weapon
- ent->client->ps.persistant[ PERS_NEWWEAPON ] =
+ ps->persistant[ PERS_NEWWEAPON ] =
BG_PrimaryWeapon( ent->client->ps.stats );
}
else
@@ -931,9 +931,6 @@ qboolean CheckVenomAttack( gentity_t *ent )
if( traceEnt->health <= 0 )
return qfalse;
- if( traceEnt->health <= 0 )
- return qfalse;
-
if( !traceEnt->client && !( traceEnt->s.eType == ET_BUILDABLE ) )
return qfalse;