tuba: don't hurt team mates, they have ear plugs matching your team's tubas ;)
authordiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Sun, 7 Jun 2009 20:04:56 +0000 (20:04 +0000)
committerdiv0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Sun, 7 Jun 2009 20:04:56 +0000 (20:04 +0000)
git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6906 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

data/qcsrc/server/g_damage.qc

index 1b3f977..4471d32 100644 (file)
@@ -584,7 +584,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
                                        RemoveGrapplingHook(targ); // STOP THAT, you parasite!
 
        // special rule: gravity bomb does not hit team mates (other than for disconnecting the hook)
-       if(DEATH_ISWEAPON(deathtype, WEP_HOOK))
+       if(DEATH_ISWEAPON(deathtype, WEP_HOOK) || DEATH_ISWEAPON(deathtype, WEP_TUBA))
        {
                if(targ.classname == "player")
                        if not(IsDifferentTeam(targ, attacker))