From: bones_was_here <bones_was_here@yahoo.com.au>
Date: Mon, 15 Jun 2020 10:28:58 +0000 (+1000)
Subject: Allow vcall timein during a timeout, and reset slowmo if SVQC shuts down during a... 
X-Git-Tag: xonotic-v0.8.5~906^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9315733d04c3fab6b6ad1e3f6d8c4627ffb860b6;p=xonotic%2Fxonotic-data.pk3dir.git

Allow vcall timein during a timeout, and reset slowmo if SVQC shuts down during a timeout
---

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index 1869a15a8..a34203ffd 100644
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -835,7 +835,7 @@ void VoteCommand_call(int request, entity caller, int argc, string vote_command)
 			{
 				print_to(caller, "^1Only connected clients can vote.");
 			}
-			else if (timeout_status)
+			else if (timeout_status && vote_command != "timein")
 			{
 				print_to(caller, "^1You can not call a vote while a timeout is active.");
 			}
diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 0e9f7fa66..67049e73b 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -2213,6 +2213,11 @@ void Shutdown()
 	if(world_initialized > 0)
 	{
 		world_initialized = 0;
+
+		// if a timeout is active, reset the slowmo value to normal
+		if(timeout_status == TIMEOUT_ACTIVE)
+			cvar_set("slowmo", ftos(orig_slowmo));
+
 		LOG_TRACE("Saving persistent data...");
 		Ban_SaveBans();