diff options
| author | Mikko Tiusanen <ams@daug.net> | 2014-05-15 18:27:16 +0300 |
|---|---|---|
| committer | Mikko Tiusanen <ams@daug.net> | 2014-05-15 18:27:16 +0300 |
| commit | 454a1a21c4d0be8e542160ff60f897594762501b (patch) | |
| tree | 9e3951a96443785a36db76359e999ab836a1c968 /src/game/g_combat.c | |
| parent | 378e1bf33dce57f941d9d93defb1a81715dc5d3f (diff) | |
Hummel pounce no longer stays charged or damages teammates after using it.
Diffstat (limited to 'src/game/g_combat.c')
| -rw-r--r-- | src/game/g_combat.c | 7 |
1 files changed, 3 insertions, 4 deletions
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; |