From 454a1a21c4d0be8e542160ff60f897594762501b Mon Sep 17 00:00:00 2001 From: Mikko Tiusanen Date: Thu, 15 May 2014 18:27:16 +0300 Subject: Hummel pounce no longer stays charged or damages teammates after using it. --- src/game/g_combat.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/game/g_combat.c') diff --git a/src/game/g_combat.c b/src/game/g_combat.c index 6fb7474..12de3a2 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -1233,8 +1233,8 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, } // don't do friendly fire on movement attacks - if( ( mod == MOD_LEVEL4_TRAMPLE || mod == MOD_LEVEL3_POUNCE || - mod == MOD_LEVEL4_CRUSH ) && + if( ( mod == MOD_LEVEL4_TRAMPLE || mod == MOD_LEVEL3_POUNCE || + mod == MOD_LEVEL5_POUNCE || mod == MOD_LEVEL4_CRUSH ) && targ->s.eType == ET_BUILDABLE && targ->buildableTeam == TEAM_ALIENS ) { return; @@ -1286,8 +1286,7 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, // don't do friendly fire on movement attacks else if( mod == MOD_LEVEL4_TRAMPLE || mod == MOD_LEVEL3_POUNCE || - - mod == MOD_LEVEL4_CRUSH ) + mod == MOD_LEVEL5_POUNCE || mod == MOD_LEVEL4_CRUSH ) return; -- cgit