diff options
| author | Tim Angus <tim@ngus.net> | 2009-10-03 12:46:30 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:16:13 +0000 |
| commit | 120a3dd717954482db9109358f26b009f05d0421 (patch) | |
| tree | a11dbb06594df9b6bfb954769a979b77f89d0a42 /src/game/g_weapon.c | |
| parent | 947d079b94b7cfb2cf42d612ede728c34552d373 (diff) | |
* Various changes resulting from sanity checking against mgdev HEAD
Diffstat (limited to 'src/game/g_weapon.c')
| -rw-r--r-- | src/game/g_weapon.c | 5 |
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; |