Properly support team field on trigger_multiple

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / round_handler.qc

diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc
index 8fb1a787be1904edee99e5e3bd93831fb7f7194d..ae64e74e4909d66882ea09e261926086977b4da0 100644 (file)
--- a/qcsrc/server/round_handler.qc
+++ b/qcsrc/server/round_handler.qc
@@ -1,25 +1,28 @@
 #include "round_handler.qh"
 
+#include <server/defs.qh>
+#include <server/miscfunctions.qh>
+#include "campaign.qh"
 #include "command/vote.qh"
 #include "../common/util.qh"
 
-void round_handler_Think()
+void round_handler_Think(entity this)
 {
-       SELFPARAM();
-
-       if (time < game_starttime)
+       if (intermission_running)
        {
-               round_handler_Reset(game_starttime);
+               round_handler_Reset(0);
+               round_handler_Remove();
                return;
        }
 
-       if (gameover)
+       if (time < game_starttime)
        {
-               round_handler_Reset(0);
-               round_handler_Remove();
+               round_handler_Reset(game_starttime);
                return;
        }
 
+       game_stopped = false;
+
        if (this.wait)
        {
                this.wait = false;
@@ -30,7 +33,7 @@ void round_handler_Think()
 
        if (this.cnt > 0)  // countdown running
        {
-               if (this.canRoundStart())
+               if (this.canRoundStart() && !(autocvar_g_campaign && !campaign_bots_may_start))
                {
                        if (this.cnt == this.count + 1) round_starttime = time + this.count;
                        int f = this.cnt - 1;
@@ -75,12 +78,11 @@ void round_handler_Init(float the_delay, float the_count, float the_round_timeli
 }
 
 // NOTE: this is only needed because if round_handler spawns at time 1
-// gamestarttime isn't initialized yet
-void round_handler_FirstThink()
+// game_starttime isn't initialized yet
+void round_handler_FirstThink(entity this)
 {
-       SELFPARAM();
        round_starttime = max(time, game_starttime) + this.count;
-       this.think = round_handler_Think;
+       setthink(this, round_handler_Think);
        this.nextthink = max(time, game_starttime);
 }
 
@@ -93,7 +95,7 @@ void round_handler_Spawn(float() canRoundStart_func, float() canRoundEnd_func, v
        }
        entity this = round_handler = new(round_handler);
 
-       this.think = round_handler_FirstThink;
+       setthink(this, round_handler_FirstThink);
        this.canRoundStart = canRoundStart_func;
        this.canRoundEnd = canRoundEnd_func;
        this.roundStart = roundStart_func;
@@ -114,6 +116,6 @@ void round_handler_Reset(float next_think)
 
 void round_handler_Remove()
 {
-       remove(round_handler);
-       round_handler = world;
+       delete(round_handler);
+       round_handler = NULL;
 }