Merge branch 'master' into Mario/qc_physics_prehax

[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 5b2d8fcff9199a9a8cb400aacba0c6281b056047..4294eac2aad6f2f577e5a46cb63d2548557b5f6d 100644 (file)
--- a/qcsrc/common/triggers/misc/corner.qc
+++ b/qcsrc/common/triggers/misc/corner.qc
@@ -14,22 +14,25 @@ bool corner_send(entity to, int sf)
        WriteString(MSG_ENTITY, self.target3);
        WriteString(MSG_ENTITY, self.target4);
        WriteString(MSG_ENTITY, self.targetname);
+       WriteByte(MSG_ENTITY, self.target_random);
+
+       WriteByte(MSG_ENTITY, self.wait);
 
        return true;
 }
 
 void corner_link()
 {
-       Net_LinkEntity(self, false, 0, corner_send);
+       //Net_LinkEntity(self, false, 0, corner_send);
 }
 
 void spawnfunc_path_corner()
 {
-       corner_link();
-
        // 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);
+
+       corner_link();
 }
 #elif defined(CSQC)
 
@@ -51,7 +54,7 @@ void corner_remove()
        self.targetname = string_null;
 
        if(self.platmovetype) { strunzone(self.platmovetype); }
-       self.targetname = string_null;
+       self.platmovetype = string_null;
 }
 
 void ent_corner()
@@ -61,12 +64,16 @@ void ent_corner()
        self.origin_x = ReadCoord();
        self.origin_y = ReadCoord();
        self.origin_z = ReadCoord();
+       setorigin(self, self.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();
+
+       self.wait = ReadByte();
 
        self.classname = "path_corner";
        self.drawmask = MASK_NORMAL;