Merge branch 'master' into terencehill/infomessages_panel_update

[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 d90e3418caab154454fbafeb36a6c350827bd177..efddf8c77f89eb99787af0075e448e1035ad4082 100644 (file)
--- a/qcsrc/common/triggers/trigger/gamestart.qc
+++ b/qcsrc/common/triggers/trigger/gamestart.qc
@@ -1,25 +1,27 @@
 #ifdef SVQC
-void gamestart_use()
-{SELFPARAM();
-       activator = self;
-       SUB_UseTargets();
-       remove(self);
+void gamestart_use(entity this, entity actor, entity trigger)
+{
+       SUB_UseTargets(this, this, trigger);
+       remove(this);
+}
+
+void gamestart_use_this(entity this)
+{
+       gamestart_use(this, NULL, NULL);
 }
 
-void self_spawnfunc_trigger_gamestart();
 spawnfunc(trigger_gamestart)
 {
        this.use = gamestart_use;
-       this.reset2 = self_spawnfunc_trigger_gamestart;
+       this.reset2 = spawnfunc_trigger_gamestart;
 
        if(this.wait)
        {
-               this.think = this.use;
+               setthink(this, adaptor_think2use);
                this.nextthink = game_starttime + this.wait;
        }
        else
-               InitializeEntity(this, gamestart_use, INITPRIO_FINDTARGET);
+               InitializeEntity(this, gamestart_use_this, INITPRIO_FINDTARGET);
 }
-void self_spawnfunc_trigger_gamestart() { SELFPARAM(); spawnfunc_trigger_gamestart(this); }
 
 #endif