]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
simplify more; allow sticking to shootable buttons
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 13 Jun 2011 14:05:44 +0000 (16:05 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 13 Jun 2011 14:05:44 +0000 (16:05 +0200)
qcsrc/server/w_minelayer.qc

index 42bf4efa5a11328eb0267fc3bc0e009ffa9077e9..b4ecb9b5519620411ac834deb9098cff4c615b45 100644 (file)
@@ -225,16 +225,10 @@ void W_Mine_Touch (void)
 
        PROJECTILE_TOUCH;
 
-       if(other && other.takedamage == DAMAGE_AIM)
+       if(other && other.classname == "player" && other.deadflag == DEAD_NO)
        {
-               // hit some enemy
-               // we do nothing, other than clearing velocity (falling straight down)
-
-               // allow falling down, but no other movement, when hit an enemy
-               self.velocity_x = 0;
-               self.velocity_y = 0;
-               if(self.velocity_z > 0)
-                       self.velocity_z = 0;
+               // hit a player
+               // don't stick
        }
        else
        {