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 be3671b924db4fcb909977129ddd174f60be7e49..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)))
@@ -170,10 +168,28 @@ void trigger_push_touch()
                other.move_velocity = other.velocity;
        }
 
+#ifdef SVQC
        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
        if (IS_PLAYER(other))
        {
@@ -241,6 +257,12 @@ void trigger_push_touch()
                UpdateCSQCProjectile(other);
        }
 
+       /*if (other.flags & FL_ITEM)
+       {
+               ItemUpdate(other);
+               other.SendFlags |= ISF_DROP;
+       }*/
+
        if (this.spawnflags & PUSH_ONCE)
        {
                this.touch = func_null;
@@ -318,26 +340,16 @@ void trigger_push_findtarget()
 }
 
 #ifdef SVQC
-float trigger_push_send(entity to, float sf)
-{SELFPARAM();
+float trigger_push_send(entity this, entity to, float sf)
+{
        WriteHeader(MSG_ENTITY, ENT_CLIENT_TRIGGER_PUSH);
-       WriteByte(MSG_ENTITY, sf);
 
-       if(sf & 1)
-       {
-               WriteByte(MSG_ENTITY, self.team);
-               WriteInt24_t(MSG_ENTITY, self.spawnflags);
-               WriteByte(MSG_ENTITY, self.active);
-               WriteByte(MSG_ENTITY, self.height);
+       WriteByte(MSG_ENTITY, self.team);
+       WriteInt24_t(MSG_ENTITY, self.spawnflags);
+       WriteByte(MSG_ENTITY, self.active);
+       WriteCoord(MSG_ENTITY, self.height);
 
-               trigger_common_write(true);
-       }
-
-       if(sf & 2)
-       {
-               WriteByte(MSG_ENTITY, self.team);
-               WriteByte(MSG_ENTITY, self.active);
-       }
+       trigger_common_write(self, true);
 
        return true;
 }
@@ -349,10 +361,9 @@ void trigger_push_updatelink()
 
 void trigger_push_link()
 {
-       //Net_LinkEntity(self, false, 0, trigger_push_send);
+       trigger_link(self, trigger_push_send);
 }
-#endif
-#ifdef SVQC
+
 /*
  * ENTITY PARAMETERS:
  *
@@ -369,7 +380,7 @@ spawnfunc(trigger_push)
 {
        SetMovedir(self);
 
-       EXACTTRIGGER_INIT;
+       trigger_init(self);
 
        self.active = ACTIVE_ACTIVE;
        self.use = trigger_push_use;
@@ -399,12 +410,17 @@ bool target_push_send(entity this, entity to, float sf)
        WriteCoord(MSG_ENTITY, self.origin_y);
        WriteCoord(MSG_ENTITY, self.origin_z);
 
+       WriteAngle(MSG_ENTITY, self.angles_x);
+       WriteAngle(MSG_ENTITY, self.angles_y);
+       WriteAngle(MSG_ENTITY, self.angles_z);
+
        return true;
 }
 
 void target_push_link()
 {SELFPARAM();
-       //Net_LinkEntity(self, false, 0, target_push_send);
+       BITSET_ASSIGN(self.effects, EF_NODEPTHTEST);
+       Net_LinkEntity(self, false, 0, target_push_send);
        //self.SendFlags |= 1; // update
 }
 
@@ -412,38 +428,28 @@ spawnfunc(target_push) { target_push_link(); }
 spawnfunc(info_notnull) { target_push_link(); }
 spawnfunc(target_position) { make_pure(this); target_push_link(); }
 
-#endif
-
-#ifdef CSQC
+#elif defined(CSQC)
 
 NET_HANDLE(ENT_CLIENT_TRIGGER_PUSH, bool isnew)
 {
-       float sf = ReadByte();
+       make_pure(this);
 
-       if(sf & 1)
-       {
-               self.classname = "jumppad";
-               int mytm = ReadByte(); if(mytm) { self.team = mytm - 1; }
-               self.spawnflags = ReadInt24_t();
-               self.active = ReadByte();
-               self.height = ReadByte();
-
-               trigger_common_read(true);
-
-               self.entremove = trigger_remove_generic;
-               self.solid = SOLID_TRIGGER;
-               self.draw = trigger_draw_generic;
-               self.trigger_touch = trigger_push_touch;
-               self.drawmask = MASK_NORMAL;
-               self.move_time = time;
-               trigger_push_findtarget();
-       }
+       self.classname = "jumppad";
+       int mytm = ReadByte(); if(mytm) { self.team = mytm - 1; }
+       self.spawnflags = ReadInt24_t();
+       self.active = ReadByte();
+       self.height = ReadCoord();
+
+       trigger_common_read(true);
+
+       self.entremove = trigger_remove_generic;
+       self.solid = SOLID_TRIGGER;
+       //self.draw = trigger_draw_generic;
+       self.move_touch = trigger_push_touch;
+       self.drawmask = MASK_NORMAL;
+       self.move_time = time;
+       defer(self, 0.25, trigger_push_findtarget);
 
-       if(sf & 2)
-       {
-               self.team = ReadByte();
-               self.active = ReadByte();
-       }
        return true;
 }
 
@@ -460,6 +466,7 @@ void target_push_remove()
 
 NET_HANDLE(ENT_CLIENT_TARGET_PUSH, bool isnew)
 {
+       make_pure(this);
        self.classname = "push_target";
        self.cnt = ReadByte();
        self.targetname = strzone(ReadString());
@@ -467,6 +474,10 @@ NET_HANDLE(ENT_CLIENT_TARGET_PUSH, bool isnew)
        self.origin_y = ReadCoord();
        self.origin_z = ReadCoord();
 
+       self.angles_x = ReadAngle();
+       self.angles_y = ReadAngle();
+       self.angles_z = ReadAngle();
+
        return = true;
 
        setorigin(self, self.origin);