spawnfunc and SendEntity3 have a 'this' parameter, use it

[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 d081807bccb3072bcf466c74efb003d8f7346e45..77f430640abef6a57105b04a063b94080d222de7 100644 (file)
--- a/qcsrc/common/triggers/misc/corner.qc
+++ b/qcsrc/common/triggers/misc/corner.qc
@@ -1,40 +1,40 @@
 REGISTER_NET_LINKED(ENT_CLIENT_CORNER)
 
 #ifdef SVQC
-bool corner_send(entity to, int sf)
-{SELFPARAM();
+bool corner_send(entity this, entity to, int sf)
+{
        WriteHeader(MSG_ENTITY, ENT_CLIENT_CORNER);
 
-       WriteString(MSG_ENTITY, self.platmovetype);
+       WriteString(MSG_ENTITY, this.platmovetype);
 
-       WriteCoord(MSG_ENTITY, self.origin_x);
-       WriteCoord(MSG_ENTITY, self.origin_y);
-       WriteCoord(MSG_ENTITY, self.origin_z);
+       WriteCoord(MSG_ENTITY, this.origin_x);
+       WriteCoord(MSG_ENTITY, this.origin_y);
+       WriteCoord(MSG_ENTITY, this.origin_z);
 
-       WriteString(MSG_ENTITY, self.target);
-       WriteString(MSG_ENTITY, self.target2);
-       WriteString(MSG_ENTITY, self.target3);
-       WriteString(MSG_ENTITY, self.target4);
-       WriteString(MSG_ENTITY, self.targetname);
-       WriteByte(MSG_ENTITY, self.target_random);
+       WriteString(MSG_ENTITY, this.target);
+       WriteString(MSG_ENTITY, this.target2);
+       WriteString(MSG_ENTITY, this.target3);
+       WriteString(MSG_ENTITY, this.target4);
+       WriteString(MSG_ENTITY, this.targetname);
+       WriteByte(MSG_ENTITY, this.target_random);
 
-       WriteByte(MSG_ENTITY, self.wait);
+       WriteByte(MSG_ENTITY, this.wait);
 
        return true;
 }
 
-void corner_link()
+void corner_link(entity this)
 {
-       //Net_LinkEntity(self, false, 0, corner_send);
+       //Net_LinkEntity(this, false, 0, corner_send);
 }
 
 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
-       set_platmovetype(self, self.platmovetype);
+       set_platmovetype(this, this.platmovetype);
 
-       corner_link();
+       corner_link(this);
 }
 #elif defined(CSQC)