From 1895729b01532be9589d3606c331cc8f9ca9a9e3 Mon Sep 17 00:00:00 2001 From: Paweł Redman Date: Fri, 26 Jun 2015 03:19:59 +0200 Subject: More bug fixes for Wraith. --- src/game/g_active.c | 7 ++++--- src/game/g_combat.c | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'src/game') diff --git a/src/game/g_active.c b/src/game/g_active.c index cac7e7f..e23b0c5 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -1471,6 +1471,7 @@ void ClientThink_real( gentity_t *ent ) int msec; usercmd_t *ucmd; int i; + float modifier = 1.0f; client = ent->client; @@ -1596,7 +1597,6 @@ void ClientThink_real( gentity_t *ent ) int i, num; int count, interval; vec3_t range, mins, maxs; - float modifier = 1.0f; VectorSet( range, REGEN_BOOST_RANGE, REGEN_BOOST_RANGE, REGEN_BOOST_RANGE ); @@ -1670,9 +1670,10 @@ void ClientThink_real( gentity_t *ent ) } if( client->ps.weapon == WP_ALEVEL1 && - client->lastWarpTime + LEVEL1_WARP_REGEN_DELAY <= level.time ) + client->lastWarpTime + LEVEL1_WARP_REGEN_DELAY <= level.time && + G_Overmind( ) ) { - client->ps.stats[ STAT_MISC ] += msec * LEVEL1_WARP_REGEN_RATE; + client->ps.stats[ STAT_MISC ] += msec * LEVEL1_WARP_REGEN_RATE * modifier; if( client->ps.stats[ STAT_MISC ] > LEVEL1_WARP_TIME ) { diff --git a/src/game/g_combat.c b/src/game/g_combat.c index 50eca22..bfe0de9 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -1575,6 +1575,9 @@ qboolean G_SelectiveRadiusDamage( vec3_t origin, gentity_t *attacker, float dama if( !ent->takedamage ) continue; + if( ent->s.eFlags & EF_WARPING ) + continue; + if( ent->flags & FL_NOTARGET ) continue; @@ -1692,6 +1695,9 @@ qboolean G_RadiusDamage( vec3_t origin, gentity_t *attacker, float damage, if( ent == ignore ) continue; + if( ent->s.eFlags & EF_WARPING ) + continue; + if( !ent->takedamage ) continue; -- cgit