Add missing SELFPARAM()

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / func / train.qc

diff --git a/qcsrc/common/triggers/func/train.qc b/qcsrc/common/triggers/func/train.qc
index 80350e743b94ba07c27abf54cb3eb7c0f0bd47fb..77bb7b87090b4e093180c0b1ec0cf2cb2fa205c1 100644 (file)
--- a/qcsrc/common/triggers/func/train.qc
+++ b/qcsrc/common/triggers/func/train.qc
@@ -1,5 +1,8 @@
 .float train_wait_turning;
 void() train_next;
+#ifdef SVQC
+void train_use();
+#endif
 void train_wait()
 {SELFPARAM();
        WITH(entity, self, self.enemy, SUB_UseTargets());
@@ -36,7 +39,17 @@ void train_wait()
                stopsoundto(MSG_BROADCAST, self, CH_TRIGGER_SINGLE); // send this as unreliable only, as the train will resume operation shortly anyway
 #endif
 
-       if(self.wait < 0 || self.train_wait_turning) // no waiting or we already waited while turning
+#ifdef SVQC
+       entity tg = find(world, targetname, self.target);
+       if(tg.spawnflags & 4)
+       {
+               self.use = train_use;
+               self.SUB_THINK = func_null;
+               self.SUB_NEXTTHINK = 0;
+       }
+       else
+#endif
+            if(self.wait < 0 || self.train_wait_turning) // no waiting or we already waited while turning
        {
                self.train_wait_turning = false;
                train_next();
@@ -117,7 +130,7 @@ float train_send(entity to, float sf)
 
                WriteString(MSG_ENTITY, self.model);
 
-               trigger_common_write(true);
+               trigger_common_write(self, true);
 
                WriteString(MSG_ENTITY, self.curvetarget);
 
@@ -165,6 +178,7 @@ void train_link()
 
 void train_use()
 {
+    SELFPARAM();
        self.SUB_NEXTTHINK = self.SUB_LTIME + 1;
        self.SUB_THINK = train_next;
        self.use = func_null; // not again