merged q1bsp and q3bsp surface rendering

[xonotic/darkplaces.git] / host.c

diff --git a/host.c b/host.c
index a4debb6293c83c45188c87da746c131ddc139d97..19bd12ad65b7483e91ab5e1bb210a60414f3775c 100644 (file)
--- a/host.c
+++ b/host.c
@@ -278,9 +278,10 @@ void Host_SaveConfig_f(void)
 
 // dedicated servers initialize the host but don't parse and set the
 // config.cfg cvars
-       if (host_initialized && cls.state != ca_dedicated)
+       // LordHavoc: save a config only after Host_Frame finished the first frame
+       if (host_initialized && host_loopactive && cls.state != ca_dedicated)
        {
-               f = FS_Open ("config.cfg", "wb", false);
+               f = FS_Open ("config.cfg", "wb", false, false);
                if (!f)
                {
                        Con_Print("Couldn't write config.cfg.\n");
@@ -563,7 +564,7 @@ qboolean Host_FilterTime (double time)
        double timecap, timeleft;
        realtime += time;
 
-       if (sys_ticrate.value < 0.01 || sys_ticrate.value > 0.10001)
+       if (sys_ticrate.value < 0.00999 || sys_ticrate.value > 0.10001)
                Cvar_SetValue("sys_ticrate", bound(0.01, sys_ticrate.value, 0.1));
        if (slowmo.value < 0)
                Cvar_SetValue("slowmo", 0);
@@ -942,6 +943,7 @@ void Host_Init (void)
        if (cls.state != ca_dedicated)
        {
                VID_Open();
+               CDAudio_Startup();
                CL_InitTEnts ();  // We must wait after sound startup to load tent sounds
                SCR_BeginLoadingPlaque();
                MR_Init();
@@ -977,15 +979,22 @@ void Host_Init (void)
        else
                Cbuf_InsertText("exec quake.rc\n");
 
+       Cbuf_Execute();
+       Cbuf_Execute();
+       Cbuf_Execute();
+
        if (!sv.active && (cls.state == ca_dedicated || COM_CheckParm("-listen")))
                Cbuf_InsertText ("startmap_dm\n");
 
        // check for special benchmark mode
 // COMMANDLINEOPTION: Client: -benchmark <demoname> runs a timedemo and quits, results of any timedemo can be found in gamedir/benchmark.log (for example id1/benchmark.log)
        i = COM_CheckParm("-benchmark");
-       if (i && i + 1 < com_argc)
+       if (i && i + 1 < com_argc && !sv.active)
                Cbuf_InsertText(va("timedemo %s\n", com_argv[i + 1]));
 
+       if (!sv.active && !cls.demoplayback && !cls.connect_trying)
+               Cbuf_InsertText("togglemenu\n");
+
        Cbuf_Execute();
 
        // We must wait for the log_file cvar to be initialized to start the log