From: Mario <mario@smbclan.net>
Date: Mon, 9 Jan 2017 10:47:14 +0000 (+1000)
Subject: Restore round handler resetting behaviour by not setting game_stopped during round... 
X-Git-Tag: xonotic-v0.8.2~309
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8e7b268a4d8fe1b0e3e4d3e21420f4b35fd39eaf;p=xonotic%2Fxonotic-data.pk3dir.git

Restore round handler resetting behaviour by not setting game_stopped during round intermission
---

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index e6cd4c154..63d78a18f 100644
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -367,8 +367,8 @@ void reset_map(bool dorespawn)
 	{
 		if (!MUTATOR_CALLHOOK(reset_map_players))
 		{
-			//if (restart_mapalreadyrestarted || (time < game_starttime))
-			//{
+			if (restart_mapalreadyrestarted || (time < game_starttime))
+			{
 				FOREACH_CLIENT(IS_PLAYER(it),
 				{
 					/*
@@ -386,7 +386,7 @@ void reset_map(bool dorespawn)
 					it.movement = '0 0 0';
 					PutClientInServer(it);
 				});
-			//}
+			}
 		}
 	}
 }
diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc
index c26bf629c..fc2c44e5a 100644
--- a/qcsrc/server/round_handler.qc
+++ b/qcsrc/server/round_handler.qc
@@ -58,7 +58,7 @@ void round_handler_Think(entity this)
 			// schedule a new round
 			this.wait = true;
 			this.nextthink = time + this.delay;
-			game_stopped = true;
+			//game_stopped = true; // not all modes actually pause during round intermission
 		}
 		else
 		{