Move game_stopped setting to game modes that want it

diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
index 5d67f9d62578c905b5a295e975df50ca996b4c14..877a8d0235a53ac0fd01e8cfcfd9d104e23d2c4c 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
+++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
@@ -1195,6 +1195,7 @@ bool Onslaught_CheckWinner()
                nades_Clear(it);
        });
 
+       game_stopped = true;
        return 1;
 }
 

diff --git a/qcsrc/server/mutators/mutator/gamemode_ca.qc b/qcsrc/server/mutators/mutator/gamemode_ca.qc
index 44c9d1592a4da0e78230d3d0c0993045341294fe..e8dcdfea5a67664f5b551468b660a4be20109438 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_ca.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_ca.qc
@@ -58,9 +58,11 @@ float CA_CheckWinner()
        {
                Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_ROUND_OVER);
                Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_ROUND_OVER);
+               FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(nades_Clear(it)));
+
                allowed_to_spawn = false;
+               game_stopped = true;
                round_handler_Init(5, autocvar_g_ca_warmup, autocvar_g_ca_round_timelimit);
-               FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(nades_Clear(it)));
                return 1;
        }
 
@@ -82,6 +84,7 @@ float CA_CheckWinner()
        }
 
        allowed_to_spawn = false;
+       game_stopped = true;
        round_handler_Init(5, autocvar_g_ca_warmup, autocvar_g_ca_round_timelimit);
 
        FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(nades_Clear(it)));

diff --git a/qcsrc/server/mutators/mutator/gamemode_domination.qc b/qcsrc/server/mutators/mutator/gamemode_domination.qc
index ee9bdfa873454eb3c82c48a9364bce7c3a0019c8..c236ab8a212cc52c4755eff8e44e29294617c9ce 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_domination.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_domination.qc
@@ -342,6 +342,8 @@ float Domination_CheckWinner()
        {
                Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_ROUND_OVER);
                Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_ROUND_OVER);
+
+               game_stopped = true;
                round_handler_Init(5, autocvar_g_domination_warmup, autocvar_g_domination_round_timelimit);
                return 1;
        }
@@ -365,6 +367,7 @@ float Domination_CheckWinner()
                Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_ROUND_TIED);
        }
 
+       game_stopped = true;
        round_handler_Init(5, autocvar_g_domination_warmup, autocvar_g_domination_round_timelimit);
 
        return 1;

diff --git a/qcsrc/server/mutators/mutator/gamemode_freezetag.qc b/qcsrc/server/mutators/mutator/gamemode_freezetag.qc
index 69f55a3c84a49efa44eae6b57bbbf952a3e50f55..2310ab4e6cdaa998a2999366790d89dbf7ee5f1e 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_freezetag.qc
@@ -110,6 +110,7 @@ float freezetag_CheckWinner()
                        it.freezetag_frozen_timeout = 0;
                        nades_Clear(it);
                ));
+               game_stopped = true;
                round_handler_Init(5, autocvar_g_freezetag_warmup, autocvar_g_freezetag_round_timelimit);
                return 1;
        }
@@ -134,6 +135,8 @@ float freezetag_CheckWinner()
                it.freezetag_frozen_timeout = 0;
                nades_Clear(it);
        ));
+
+       game_stopped = true;
        round_handler_Init(5, autocvar_g_freezetag_warmup, autocvar_g_freezetag_round_timelimit);
        return 1;
 }

diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc
index fc2c44e5af7d5118cea2786daa9facb91f569cba..786635af07e4b145383f91ea9d2d325b8670a3d1 100644 (file)
--- a/qcsrc/server/round_handler.qc
+++ b/qcsrc/server/round_handler.qc
@@ -58,7 +58,6 @@ void round_handler_Think(entity this)
                        // schedule a new round
                        this.wait = true;
                        this.nextthink = time + this.delay;
-                       //game_stopped = true; // not all modes actually pause during round intermission
                }
                else
                {