]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Detonate mines if owner becomes frozen, don't auto detonate mines if the enemy is...
authorMario <mario.mario@y7mail.com>
Thu, 22 May 2014 16:13:30 +0000 (02:13 +1000)
committerMario <mario.mario@y7mail.com>
Thu, 22 May 2014 16:13:30 +0000 (02:13 +1000)
qcsrc/server/w_minelayer.qc

index 5d88df8b254ac08be41bcec0422d0af8a464a34c..ec36f5d32541cea2fbca1c8fa29572b0e1994d06 100644 (file)
@@ -195,7 +195,7 @@ void W_Mine_Think (void)
 
        // a player's mines shall explode if he disconnects or dies
        // TODO: Do this on team change too -- Samual: But isn't a player killed when they switch teams?
-       if(!IS_PLAYER(self.realowner) || self.realowner.deadflag != DEAD_NO)
+       if(!IS_PLAYER(self.realowner) || self.realowner.deadflag != DEAD_NO || self.realowner.freezetag_frozen)
        {
                other = world;
                self.projectiledeathtype |= HITTYPE_BOUNCE;
@@ -207,7 +207,7 @@ void W_Mine_Think (void)
        head = findradius(self.origin, autocvar_g_balance_minelayer_proximityradius);
        while(head)
        {
-               if(IS_PLAYER(head) && head.deadflag == DEAD_NO)
+               if(IS_PLAYER(head) && head.deadflag == DEAD_NO && !head.freezetag_frozen)
                if(head != self.realowner && DIFF_TEAM(head, self.realowner)) // don't trigger for team mates
                if(!self.mine_time)
                {