Merge branch 'master' into TimePath/csqc_viewmodels

[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 cdc181ceb6513a769157756bd26e0e12c22cdbf7..0b3be0056de03bb8dafd15683d77eb73b919d38d 100644 (file)
--- a/qcsrc/common/triggers/trigger/jumppads.qc
+++ b/qcsrc/common/triggers/trigger/jumppads.qc
@@ -1,6 +1,5 @@
 // TODO: split target_push and put it in the target folder
 #ifdef SVQC
-#include "../../../server/_all.qh"
 #include "jumppads.qh"
 #include "../../movetypes/movetypes.qh"
 
@@ -14,6 +13,9 @@ void trigger_push_use()
 }
 #endif
 
+REGISTER_NET_LINKED(ENT_CLIENT_TRIGGER_PUSH)
+REGISTER_NET_LINKED(ENT_CLIENT_TARGET_PUSH)
+
 /*
        trigger_push_calculatevelocity
 
@@ -318,7 +320,7 @@ void trigger_push_findtarget()
 #ifdef SVQC
 float trigger_push_send(entity to, float sf)
 {SELFPARAM();
-       WriteByte(MSG_ENTITY, ENT_CLIENT_TRIGGER_PUSH);
+       WriteHeader(MSG_ENTITY, ENT_CLIENT_TRIGGER_PUSH);
        WriteByte(MSG_ENTITY, sf);
 
        if(sf & 1)
@@ -363,9 +365,9 @@ void trigger_push_link()
  *            values to target a point on the ceiling.
  *   movedir: if target is not set, this * speed * 10 is the velocity to be reached.
  */
-void spawnfunc_trigger_push()
-{SELFPARAM();
-       SetMovedir ();
+spawnfunc(trigger_push)
+{
+       SetMovedir(self);
 
        EXACTTRIGGER_INIT;
 
@@ -387,9 +389,9 @@ void spawnfunc_trigger_push()
 }
 
 
-float target_push_send(entity to, float sf)
-{SELFPARAM();
-       WriteByte(MSG_ENTITY, ENT_CLIENT_TARGET_PUSH);
+bool target_push_send(entity this, entity to, float sf)
+{
+       WriteHeader(MSG_ENTITY, ENT_CLIENT_TARGET_PUSH);
 
        WriteByte(MSG_ENTITY, self.cnt);
        WriteString(MSG_ENTITY, self.targetname);
@@ -402,20 +404,20 @@ 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
+       //Net_LinkEntity(self, false, 0, target_push_send);
+       //self.SendFlags |= 1; // update
 }
 
-void spawnfunc_target_push() { target_push_link(); }
-void spawnfunc_info_notnull() { target_push_link(); }
-void spawnfunc_target_position() { target_push_link(); }
+spawnfunc(target_push) { target_push_link(); }
+spawnfunc(info_notnull) { target_push_link(); }
+spawnfunc(target_position) { make_pure(this); target_push_link(); }
 
 #endif
 
 #ifdef CSQC
 
-void ent_trigger_push()
-{SELFPARAM();
+NET_HANDLE(ENT_CLIENT_TRIGGER_PUSH, bool isnew)
+{
        float sf = ReadByte();
 
        if(sf & 1)
@@ -442,6 +444,7 @@ void ent_trigger_push()
                self.team = ReadByte();
                self.active = ReadByte();
        }
+       return true;
 }
 
 void target_push_remove()
@@ -455,14 +458,17 @@ void target_push_remove()
        self.targetname = string_null;
 }
 
-void ent_target_push()
-{SELFPARAM();
+NET_HANDLE(ENT_CLIENT_TARGET_PUSH, bool isnew)
+{
        self.classname = "push_target";
        self.cnt = ReadByte();
        self.targetname = strzone(ReadString());
        self.origin_x = ReadCoord();
        self.origin_y = ReadCoord();
        self.origin_z = ReadCoord();
+
+       return = true;
+
        setorigin(self, self.origin);
 
        self.drawmask = MASK_NORMAL;