Merge branch 'master' into Mario/hagar_notfixed

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

diff --git a/qcsrc/common/triggers/trigger/gamestart.qc b/qcsrc/common/triggers/trigger/gamestart.qc
index 3ad419d22fc287388949f7a5c0ba2842a13d4216..9c0c0791ab3443c3b25672c1dda77b42add84dba 100644 (file)
--- a/qcsrc/common/triggers/trigger/gamestart.qc
+++ b/qcsrc/common/triggers/trigger/gamestart.qc
@@ -1,22 +1,25 @@
 #ifdef SVQC
-void gamestart_use()
+void gamestart_use(entity this)
 {
        activator = self;
        SUB_UseTargets();
        remove(self);
 }
 
-void spawnfunc_trigger_gamestart()
+void self_spawnfunc_trigger_gamestart();
+spawnfunc(trigger_gamestart)
 {
-       self.use = gamestart_use;
-       self.reset2 = spawnfunc_trigger_gamestart;
+       setuse(this, gamestart_use);
+       this.reset2 = self_spawnfunc_trigger_gamestart;
 
-       if(self.wait)
+       if(this.wait)
        {
-               self.think = self.use;
-               self.nextthink = game_starttime + self.wait;
+               this.think = this.use;
+               this.nextthink = game_starttime + this.wait;
        }
        else
-               InitializeEntity(self, gamestart_use, INITPRIO_FINDTARGET);
+               InitializeEntity(this, gamestart_use, INITPRIO_FINDTARGET);
 }
+void self_spawnfunc_trigger_gamestart() { SELFPARAM(); spawnfunc_trigger_gamestart(this); }
+
 #endif