Combine `SELFCALL` and `SELFCALL_DONE` with `WITH`

[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 dc269bdd5c1255da484c03a9dbf267d03c26716f..5eb25221821def3f73fb5b13d22994f3fb337cd8 100644 (file)
--- a/qcsrc/common/triggers/trigger/jumppads.qc
+++ b/qcsrc/common/triggers/trigger/jumppads.qc
@@ -1,9 +1,11 @@
 // TODO: split target_push and put it in the target folder
 #ifdef SVQC
+#include "../../../server/_all.qh"
 #include "jumppads.qh"
+#include "../../movetypes/movetypes.qh"
 
 void trigger_push_use()
-{
+{SELFPARAM();
        if(teamplay)
        {
                self.team = activator.team;
@@ -126,7 +128,7 @@ vector trigger_push_calculatevelocity(vector org, entity tgt, float ht)
 }
 
 void trigger_push_touch()
-{
+{SELFPARAM();
        if (self.active == ACTIVE_NOT)
                return;
 
@@ -144,6 +146,7 @@ void trigger_push_touch()
        if(self.enemy)
        {
                other.velocity = trigger_push_calculatevelocity(other.origin, self.enemy, self.height);
+               other.move_velocity = other.velocity;
        }
        else if(self.target)
        {
@@ -157,14 +160,18 @@ void trigger_push_touch()
                                RandomSelection_Add(e, 0, string_null, 1, 1);
                }
                other.velocity = trigger_push_calculatevelocity(other.origin, RandomSelection_chosen_ent, self.height);
+               other.move_velocity = other.velocity;
        }
        else
        {
                other.velocity = self.movedir;
+               other.move_velocity = other.velocity;
        }
 
        UNSET_ONGROUND(other);
 
+       other.move_flags &= ~FL_ONGROUND;
+
 #ifdef SVQC
        if (IS_PLAYER(other))
        {
@@ -174,7 +181,7 @@ void trigger_push_touch()
                if(self.pushltime < time)  // prevent "snorring" sound when a player hits the jumppad more than once
                {
                        // flash when activated
-                       pointparticles(particleeffectnum("jumppad_activate"), other.origin, other.velocity, 1);
+                       Send_Effect(EFFECT_JUMPPAD, other.origin, other.velocity, 1);
                        sound (other, CH_TRIGGER, self.noise, VOL_BASE, ATTEN_NORM);
                        self.pushltime = time + 0.2;
                }
@@ -211,12 +218,8 @@ void trigger_push_touch()
 
        if(self.enemy.target)
        {
-               entity oldself;
-               oldself = self;
                activator = other;
-               self = self.enemy;
-               SUB_UseTargets();
-               self = oldself;
+               WITH(entity, self, self.enemy, SUB_UseTargets());
        }
 
        if (other.flags & FL_PROJECTILE)
@@ -250,13 +253,13 @@ void trigger_push_link();
 void trigger_push_updatelink();
 #endif
 void trigger_push_findtarget()
-{
+{SELFPARAM();
        entity t;
        vector org;
 
        // first calculate a typical start point for the jump
        org = (self.absmin + self.absmax) * 0.5;
-       org_z = self.absmax.z - PL_MIN_z;
+       org_z = self.absmax.z - PL_MIN.z;
 
        if (self.target)
        {
@@ -314,33 +317,18 @@ void trigger_push_findtarget()
 
 #ifdef SVQC
 float trigger_push_send(entity to, float sf)
-{
+{SELFPARAM();
        WriteByte(MSG_ENTITY, ENT_CLIENT_TRIGGER_PUSH);
        WriteByte(MSG_ENTITY, sf);
 
        if(sf & 1)
        {
-               WriteString(MSG_ENTITY, self.target);
                WriteByte(MSG_ENTITY, self.team);
                WriteInt24_t(MSG_ENTITY, self.spawnflags);
                WriteByte(MSG_ENTITY, self.active);
-               WriteByte(MSG_ENTITY, self.warpzone_isboxy);
                WriteByte(MSG_ENTITY, self.height);
-               WriteByte(MSG_ENTITY, self.scale);
-               WriteCoord(MSG_ENTITY, self.origin_x);
-               WriteCoord(MSG_ENTITY, self.origin_y);
-               WriteCoord(MSG_ENTITY, self.origin_z);
-
-               WriteCoord(MSG_ENTITY, self.mins_x);
-               WriteCoord(MSG_ENTITY, self.mins_y);
-               WriteCoord(MSG_ENTITY, self.mins_z);
-               WriteCoord(MSG_ENTITY, self.maxs_x);
-               WriteCoord(MSG_ENTITY, self.maxs_y);
-               WriteCoord(MSG_ENTITY, self.maxs_z);
-
-               WriteCoord(MSG_ENTITY, self.movedir_x);
-               WriteCoord(MSG_ENTITY, self.movedir_y);
-               WriteCoord(MSG_ENTITY, self.movedir_z);
+
+               trigger_common_write(true);
        }
 
        if(sf & 2)
@@ -353,13 +341,13 @@ float trigger_push_send(entity to, float sf)
 }
 
 void trigger_push_updatelink()
-{
+{SELFPARAM();
        self.SendFlags |= 1;
 }
 
 void trigger_push_link()
 {
-       Net_LinkEntity(self, false, 0, trigger_push_send);
+       //Net_LinkEntity(self, false, 0, trigger_push_send);
 }
 #endif
 #ifdef SVQC
@@ -376,7 +364,7 @@ void trigger_push_link()
  *   movedir: if target is not set, this * speed * 10 is the velocity to be reached.
  */
 void spawnfunc_trigger_push()
-{
+{SELFPARAM();
        SetMovedir ();
 
        EXACTTRIGGER_INIT;
@@ -400,7 +388,7 @@ void spawnfunc_trigger_push()
 
 
 float target_push_send(entity to, float sf)
-{
+{SELFPARAM();
        WriteByte(MSG_ENTITY, ENT_CLIENT_TARGET_PUSH);
 
        WriteByte(MSG_ENTITY, self.cnt);
@@ -413,7 +401,7 @@ float target_push_send(entity to, float sf)
 }
 
 void target_push_link()
-{
+{SELFPARAM();
        Net_LinkEntity(self, false, 0, target_push_send);
        self.SendFlags |= 1; // update
 }
@@ -425,45 +413,22 @@ void spawnfunc_target_position() { target_push_link(); }
 #endif
 
 #ifdef CSQC
-void trigger_push_remove()
-{
-       if(self.target)
-               strunzone(self.target);
-       self.target = string_null;
-}
+
 void ent_trigger_push()
-{
+{SELFPARAM();
        float sf = ReadByte();
 
        if(sf & 1)
        {
                self.classname = "jumppad";
-               self.target = strzone(ReadString());
                int mytm = ReadByte(); if(mytm) { self.team = mytm - 1; }
                self.spawnflags = ReadInt24_t();
                self.active = ReadByte();
-               self.warpzone_isboxy = ReadByte();
                self.height = ReadByte();
-               self.scale = ReadByte();
-
-               self.origin_x = ReadCoord();
-               self.origin_y = ReadCoord();
-               self.origin_z = ReadCoord();
-               setorigin(self, self.origin);
-
-               self.mins_x = ReadCoord();
-               self.mins_y = ReadCoord();
-               self.mins_z = ReadCoord();
-               self.maxs_x = ReadCoord();
-               self.maxs_y = ReadCoord();
-               self.maxs_z = ReadCoord();
-               setsize(self, self.mins, self.maxs);
-
-               self.movedir_x = ReadCoord();
-               self.movedir_y = ReadCoord();
-               self.movedir_z = ReadCoord();
-
-               self.entremove = trigger_push_remove;
+
+               trigger_common_read(true);
+
+               self.entremove = trigger_remove_generic;
                self.solid = SOLID_TRIGGER;
                self.draw = trigger_draw_generic;
                self.trigger_touch = trigger_push_touch;
@@ -480,7 +445,7 @@ void ent_trigger_push()
 }
 
 void target_push_remove()
-{
+{SELFPARAM();
        if(self.classname)
                strunzone(self.classname);
        self.classname = string_null;
@@ -491,7 +456,7 @@ void target_push_remove()
 }
 
 void ent_target_push()
-{
+{SELFPARAM();
        self.classname = "push_target";
        self.cnt = ReadByte();
        self.targetname = strzone(ReadString());