From bf19306ad5f5e2623fc1ca15d4c8c0ed7199c9c3 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 27 Mar 2016 22:08:17 +1000 Subject: [PATCH] Fix compile --- qcsrc/common/triggers/trigger/gamestart.qc | 7 ++++++- qcsrc/server/mutators/mutator/gamemode_assault.qc | 8 ++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/qcsrc/common/triggers/trigger/gamestart.qc b/qcsrc/common/triggers/trigger/gamestart.qc index c083fc187..9e2cc26e1 100644 --- a/qcsrc/common/triggers/trigger/gamestart.qc +++ b/qcsrc/common/triggers/trigger/gamestart.qc @@ -5,6 +5,11 @@ void gamestart_use(entity this, entity actor, entity trigger) remove(this); } +void gamestart_use_this(entity this) +{ + gamestart_use(this, NULL, NULL); +} + void self_spawnfunc_trigger_gamestart(); spawnfunc(trigger_gamestart) { @@ -17,7 +22,7 @@ spawnfunc(trigger_gamestart) this.nextthink = game_starttime + this.wait; } else - InitializeEntity(this, adaptor_think2use, INITPRIO_FINDTARGET); + InitializeEntity(this, gamestart_use_this, INITPRIO_FINDTARGET); } void self_spawnfunc_trigger_gamestart() { SELFPARAM(); spawnfunc_trigger_gamestart(this); } diff --git a/qcsrc/server/mutators/mutator/gamemode_assault.qc b/qcsrc/server/mutators/mutator/gamemode_assault.qc index e358f8fba..cb6d55829 100644 --- a/qcsrc/server/mutators/mutator/gamemode_assault.qc +++ b/qcsrc/server/mutators/mutator/gamemode_assault.qc @@ -232,6 +232,10 @@ void assault_roundstart_use(entity this, entity actor, entity trigger) WITHSELF(it, turret_respawn()); )); } +void assault_roundstart_use_this(entity this) +{ + assault_roundstart_use(this, NULL, NULL); +} void assault_roundstart_use_self() { SELFPARAM(); @@ -427,9 +431,9 @@ spawnfunc(target_assault_roundstart) assault_attacker_team = NUM_TEAM_1; self.classname = "target_assault_roundstart"; - self.use = assault_roundstart_use; + self.use1 = assault_roundstart_use; self.reset2 = assault_roundstart_use_self; - InitializeEntity(self, assault_roundstart_use_self, INITPRIO_FINDTARGET); + InitializeEntity(self, assault_roundstart_use_this, INITPRIO_FINDTARGET); } // legacy bot code -- 2.39.2