Make projectiles and items interact with jumppads in CSQC

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / trigger / jumppads.qc

diff --git a/qcsrc/common/triggers/trigger/jumppads.qc b/qcsrc/common/triggers/trigger/jumppads.qc
index 8aa80a031259cce4b13f127db3c5a52d739e6747..1f2f84a7d8602c64a4386b0e41d54a95e0103569 100644 (file)
--- a/qcsrc/common/triggers/trigger/jumppads.qc
+++ b/qcsrc/common/triggers/trigger/jumppads.qc
@@ -134,10 +134,8 @@ void trigger_push_touch()
        if (this.active == ACTIVE_NOT)
                return;
 
-#ifdef SVQC
        if (!isPushable(other))
                return;
-#endif
 
        if(this.team)
                if(((this.spawnflags & 4) == 0) == (DIFF_TEAM(this, other)))
@@ -174,6 +172,22 @@ void trigger_push_touch()
        UNSET_ONGROUND(other);
 #elif defined(CSQC)
        other.move_flags &= ~FL_ONGROUND;
+
+       if (other.flags & FL_PROJECTILE)
+       {
+               other.move_angles = vectoangles (other.move_velocity);
+               switch(other.move_movetype)
+               {
+                       case MOVETYPE_FLY:
+                               other.move_movetype = MOVETYPE_TOSS;
+                               other.gravity = 1;
+                               break;
+                       case MOVETYPE_BOUNCEMISSILE:
+                               other.move_movetype = MOVETYPE_BOUNCE;
+                               other.gravity = 1;
+                               break;
+               }
+       }
 #endif
 
 #ifdef SVQC
@@ -243,11 +257,11 @@ void trigger_push_touch()
                UpdateCSQCProjectile(other);
        }
 
-       if (other.flags & FL_ITEM)
+       /*if (other.flags & FL_ITEM)
        {
                ItemUpdate(other);
                other.SendFlags |= ISF_DROP;
-       }
+       }*/
 
        if (this.spawnflags & PUSH_ONCE)
        {