Made Q1 face loading faster by using a faster lightmap packing algorithm.

[xonotic/darkplaces.git] / host_cmd.c

diff --git a/host_cmd.c b/host_cmd.c
index 706d24d07d8d9a27a2d86e72827b6dd3e32c2505..da449a672a35acfa2e2a1f77c4448e5b8e25b7b0 100644 (file)
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -264,6 +264,10 @@ void Host_Map_f (void)
                return;
        }
 
+       // GAME_DELUXEQUAKE - clear warpmark (used by QC)
+       if (gamemode == GAME_DELUXEQUAKE)
+               Cvar_Set("warpmark", "");
+
        cls.demonum = -1;               // stop demo loop in case this fails
 
        CL_Disconnect ();
@@ -561,6 +565,13 @@ void Host_Loadgame_f (void)
 
        Con_Printf("Loading game from %s...\n", filename);
 
+       // stop playing demos
+       if (cls.demoplayback)
+               CL_Disconnect ();
+
+       // remove menu
+       key_dest = key_game;
+
        cls.demonum = -1;               // stop demo loop in case this fails
 
        t = text = (char *)FS_LoadFile (filename, tempmempool, false, NULL);