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

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index 1869a15a898dc51a15ccbe25f8abe9d0714fee64..a34203ffd22025d9b3f2bd2bf2e60540ba9b5080 100644 (file)
--- 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 0e9f7fa661530e085899da83540b24f9e3065d34..67049e73b24261fee11aacd7e1a66791496d2bd7 100644 (file)
--- 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();