Merge branch 'master' into martin-t/defaults

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / misc / corner.qc

diff --git a/qcsrc/common/triggers/misc/corner.qc b/qcsrc/common/triggers/misc/corner.qc
index 77f430640abef6a57105b04a063b94080d222de7..6c9093318f6bf827abfe5caf01b254a2115ee50a 100644 (file)
--- a/qcsrc/common/triggers/misc/corner.qc
+++ b/qcsrc/common/triggers/misc/corner.qc
@@ -1,3 +1,4 @@
+#include "corner.qh"
 REGISTER_NET_LINKED(ENT_CLIENT_CORNER)
 
 #ifdef SVQC
@@ -7,9 +8,7 @@ bool corner_send(entity this, entity to, int sf)
 
        WriteString(MSG_ENTITY, this.platmovetype);
 
-       WriteCoord(MSG_ENTITY, this.origin_x);
-       WriteCoord(MSG_ENTITY, this.origin_y);
-       WriteCoord(MSG_ENTITY, this.origin_z);
+       WriteVector(MSG_ENTITY, this.origin);
 
        WriteString(MSG_ENTITY, this.target);
        WriteString(MSG_ENTITY, this.target2);
@@ -61,29 +60,27 @@ void corner_remove(entity this)
 
 NET_HANDLE(ENT_CLIENT_CORNER, bool isnew)
 {
-       self.platmovetype = strzone(ReadString());
+       this.platmovetype = strzone(ReadString());
 
-       self.origin_x = ReadCoord();
-       self.origin_y = ReadCoord();
-       self.origin_z = ReadCoord();
-       setorigin(self, self.origin);
+       this.origin = ReadVector();
+       setorigin(this, this.origin);
 
-       self.target = strzone(ReadString());
-       self.target2 = strzone(ReadString());
-       self.target3 = strzone(ReadString());
-       self.target4 = strzone(ReadString());
-       self.targetname = strzone(ReadString());
-       self.target_random = ReadByte();
+       this.target = strzone(ReadString());
+       this.target2 = strzone(ReadString());
+       this.target3 = strzone(ReadString());
+       this.target4 = strzone(ReadString());
+       this.targetname = strzone(ReadString());
+       this.target_random = ReadByte();
 
-       self.wait = ReadByte();
+       this.wait = ReadByte();
 
        return = true;
 
-       self.classname = "path_corner";
-       self.drawmask = MASK_NORMAL;
-       self.entremove = corner_remove;
+       this.classname = "path_corner";
+       this.drawmask = MASK_NORMAL;
+       this.entremove = corner_remove;
 
-       set_platmovetype(self, self.platmovetype);
+       set_platmovetype(this, this.platmovetype);
 }
 
 #endif