diff options
author | Paweł Redman <pawel.redman@gmail.com> | 2015-06-26 03:19:59 +0200 |
---|---|---|
committer | Paweł Redman <pawel.redman@gmail.com> | 2015-06-26 03:23:19 +0200 |
commit | 1895729b01532be9589d3606c331cc8f9ca9a9e3 (patch) | |
tree | 243b3526ea535df824d38fd1a3a4b841e1f63c4a /src/game/g_combat.c | |
parent | 7a9d256ea39e7ed8797801f8184e6ab7f27a21dc (diff) |
More bug fixes for Wraith.
Diffstat (limited to 'src/game/g_combat.c')
-rw-r--r-- | src/game/g_combat.c | 6 |
1 files changed, 6 insertions, 0 deletions
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; |