Merge branch 'master' into Mario/use1

[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 2b27c7355ce5b814bc1ceac5dff541aacee79a4e..0fa3ed60126fb8567a0d3853c7779848760453a5 100644 (file)
--- a/qcsrc/common/triggers/func/train.qc
+++ b/qcsrc/common/triggers/func/train.qc
@@ -1,11 +1,11 @@
 .float train_wait_turning;
 void() train_next;
 #ifdef SVQC
-void train_use();
+void train_use(entity this, entity actor, entity trigger);
 #endif
 void train_wait()
 {SELFPARAM();
-       WITHSELF(self.enemy, SUB_UseTargets());
+       SUB_UseTargets(this.enemy, NULL, NULL);
        self.enemy = world;
 
        // if turning is enabled, the train will turn toward the next point while waiting
@@ -43,7 +43,7 @@ void train_wait()
        entity tg = find(world, targetname, self.target);
        if(tg.spawnflags & 4)
        {
-               self.use = train_use;
+               self.use1 = train_use;
                self.SUB_THINK = func_null;
                self.SUB_NEXTTHINK = 0;
        }
@@ -176,12 +176,11 @@ void train_link()
        //Net_LinkEntity(self, 0, false, train_send);
 }
 
-void train_use()
+void train_use(entity this, entity actor, entity trigger)
 {
-    SELFPARAM();
-       self.SUB_NEXTTHINK = self.SUB_LTIME + 1;
-       self.SUB_THINK = train_next;
-       self.use = func_null; // not again
+       this.SUB_NEXTTHINK = this.SUB_LTIME + 1;
+       this.SUB_THINK = train_next;
+       this.use1 = func_null; // not again
 }
 
 void func_train_find(entity this)
@@ -225,7 +224,7 @@ spawnfunc(func_train)
        self.effects |= EF_LOWPRECISION;
 
        if(self.spawnflags & 4)
-               self.use = train_use;
+               self.use1 = train_use;
 
        if (self.spawnflags & 2)
        {