Merge branch 'TimePath/killself' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / trigger / multi.qc

diff --git a/qcsrc/common/triggers/trigger/multi.qc b/qcsrc/common/triggers/trigger/multi.qc
index 5ebe7017957ea7d94eaca4310f77133b8a43b3c9..435255727e7f4139e83baebe29266bdf8291f827 100644 (file)
--- a/qcsrc/common/triggers/trigger/multi.qc
+++ b/qcsrc/common/triggers/trigger/multi.qc
@@ -2,8 +2,8 @@
 
 #ifdef SVQC
 // the wait time has passed, so set back up for another activation
-void multi_wait()
-{SELFPARAM();
+void multi_wait(entity this)
+{
        if (this.max_health)
        {
                this.health = this.max_health;
@@ -50,7 +50,7 @@ void multi_trigger(entity this)
        }
        else if (this.wait == 0)
        {
-               WITHSELF(this, multi_wait()); // waiting finished
+               WITHSELF(this, multi_wait(this)); // waiting finished
        }
        else
        {       // we can't just remove (this) here, because this is a touch function
@@ -66,8 +66,8 @@ void multi_use(entity this, entity actor, entity trigger)
        multi_trigger(this);
 }
 
-void multi_touch()
-{SELFPARAM();
+void multi_touch(entity this)
+{
        if(!(self.spawnflags & 2))
        if(!other.iscreature)
                        return;