some fixes to what can be pushed, teleported, trigger_impulsed

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / t_jumppads.qc

diff --git a/qcsrc/server/t_jumppads.qc b/qcsrc/server/t_jumppads.qc
index 4712d5929f5f714d2ba5c6c9f8fdd87d48f9854f..a61c6a79decd6c01d0e63317ca5b79b5db4cf783 100644 (file)
--- a/qcsrc/server/t_jumppads.qc
+++ b/qcsrc/server/t_jumppads.qc
@@ -130,17 +130,21 @@ void trigger_push_touch()
        if (self.active == ACTIVE_NOT)
                return;
 
-       // FIXME: add a .float for whether an entity should be tossed by jumppads
-       if (!other.iscreature)
-       if (other.classname != "corpse")
+       if not(other.iscreature)
        if (other.classname != "body")
-       if (other.classname != "gib")
        if (other.classname != "casing")
+       if (other.classname != "corpse")
        if (other.classname != "droppedweapon")
+       if (other.classname != "gib")
        if (other.classname != "keepawayball")
+       if (other.classname != "nexball_basketball")
+       if (other.classname != "nexball_football")
        if (!other.projectiledeathtype || other.classname == "bullet")
                return;
 
+       if(!isPushable(other))
+               return;
+
        if (other.deadflag && other.iscreature)
                return;