From: terencehill <piuntn@gmail.com>
Date: Mon, 9 Jan 2017 18:42:17 +0000 (+0100)
Subject: Move game_stopped setting to game modes that want it
X-Git-Tag: xonotic-v0.8.2~307
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=795844d06f8e2c95f641575983b4d236857b20fb;p=xonotic%2Fxonotic-data.pk3dir.git

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 5d67f9d62..877a8d023 100644
--- 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 44c9d1592..e8dcdfea5 100644
--- 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 ee9bdfa87..c236ab8a2 100644
--- 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 69f55a3c8..2310ab4e6 100644
--- 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 fc2c44e5a..786635af0 100644
--- 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
 		{