Merge branch 'master' into terencehill/translate_colors_2

[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 4294eac2aad6f2f577e5a46cb63d2548557b5f6d..d081807bccb3072bcf466c74efb003d8f7346e45 100644 (file)
--- a/qcsrc/common/triggers/misc/corner.qc
+++ b/qcsrc/common/triggers/misc/corner.qc
@@ -1,7 +1,9 @@
+REGISTER_NET_LINKED(ENT_CLIENT_CORNER)
+
 #ifdef SVQC
 bool corner_send(entity to, int sf)
-{
-       WriteByte(MSG_ENTITY, ENT_CLIENT_CORNER);
+{SELFPARAM();
+       WriteHeader(MSG_ENTITY, ENT_CLIENT_CORNER);
 
        WriteString(MSG_ENTITY, self.platmovetype);
 
@@ -26,7 +28,7 @@ void corner_link()
        //Net_LinkEntity(self, false, 0, corner_send);
 }
 
-void spawnfunc_path_corner()
+spawnfunc(path_corner)
 {
        // setup values for overriding train movement
        // if a second value does not exist, both start and end speeds are the single value specified
@@ -36,28 +38,28 @@ void spawnfunc_path_corner()
 }
 #elif defined(CSQC)
 
-void corner_remove()
+void corner_remove(entity this)
 {
-       if(self.target) { strunzone(self.target); }
-       self.target = string_null;
+       if(this.target) { strunzone(this.target); }
+       this.target = string_null;
 
-       if(self.target2) { strunzone(self.target2); }
-       self.target2 = string_null;
+       if(this.target2) { strunzone(this.target2); }
+       this.target2 = string_null;
 
-       if(self.target3) { strunzone(self.target3); }
-       self.target3 = string_null;
+       if(this.target3) { strunzone(this.target3); }
+       this.target3 = string_null;
 
-       if(self.target4) { strunzone(self.target4); }
-       self.target4 = string_null;
+       if(this.target4) { strunzone(this.target4); }
+       this.target4 = string_null;
 
-       if(self.targetname) { strunzone(self.targetname); }
-       self.targetname = string_null;
+       if(this.targetname) { strunzone(this.targetname); }
+       this.targetname = string_null;
 
-       if(self.platmovetype) { strunzone(self.platmovetype); }
-       self.platmovetype = string_null;
+       if(this.platmovetype) { strunzone(this.platmovetype); }
+       this.platmovetype = string_null;
 }
 
-void ent_corner()
+NET_HANDLE(ENT_CLIENT_CORNER, bool isnew)
 {
        self.platmovetype = strzone(ReadString());
 
@@ -75,6 +77,8 @@ void ent_corner()
 
        self.wait = ReadByte();
 
+       return = true;
+
        self.classname = "path_corner";
        self.drawmask = MASK_NORMAL;
        self.entremove = corner_remove;