Merge branch 'master' into Mario/race_target_waypoint

[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 ad0fcaae66278f5a93a47b76f76603874e6deda2..786635af07e4b145383f91ea9d2d325b8670a3d1 100644 (file)
--- a/qcsrc/server/round_handler.qc
+++ b/qcsrc/server/round_handler.qc
@@ -1,23 +1,26 @@
 #include "round_handler.qh"
 
+#include "campaign.qh"
 #include "command/vote.qh"
 #include "../common/util.qh"
 
 void round_handler_Think(entity this)
 {
-       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;
@@ -28,7 +31,7 @@ void round_handler_Think(entity this)
 
        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;
@@ -111,6 +114,6 @@ void round_handler_Reset(float next_think)
 
 void round_handler_Remove()
 {
-       remove(round_handler);
-       round_handler = world;
+       delete(round_handler);
+       round_handler = NULL;
 }