Split the gamelog code out of miscfunctions and into its own file

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_world.qc

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 0e9f7fa661530e085899da83540b24f9e3065d34..7acb35d69896d9f0bb16bad60448d6bdde413d2d 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -11,6 +11,7 @@
 #include "command/sv_cmd.qh"
 #include "command/vote.qh"
 #include "g_hook.qh"
 #include "command/sv_cmd.qh"
 #include "command/vote.qh"
 #include "g_hook.qh"

+#include <server/gamelog.qh>

 #include "ipban.qh"
 #include "mapvoting.qh"
 #include <server/mutators/_mod.qh>
 #include "ipban.qh"
 #include "mapvoting.qh"
 #include <server/mutators/_mod.qh>


@@ -294,6 +295,7 @@ void cvar_changes_init()
                BADCVAR("nextmap");
                BADCVAR("teamplay");
                BADCVAR("timelimit");
                BADCVAR("nextmap");
                BADCVAR("teamplay");
                BADCVAR("timelimit");

+               BADCVAR("g_mapinfo_settemp_acl");

                BADCVAR("g_mapinfo_ignore_warnings");
                BADCVAR("g_maplist_ignore_sizes");
                BADCVAR("g_maplist_sizes_count_bots");
                BADCVAR("g_mapinfo_ignore_warnings");
                BADCVAR("g_maplist_ignore_sizes");
                BADCVAR("g_maplist_sizes_count_bots");


@@ -2213,6 +2215,11 @@ void Shutdown()
        if(world_initialized > 0)
        {
                world_initialized = 0;
        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();
 
                LOG_TRACE("Saving persistent data...");
                Ban_SaveBans();