model_brush: Demote a Host_Error to Con_Printf warn for irregular lightmap sizes

[xonotic/darkplaces.git] / host.c

diff --git a/host.c b/host.c
index 4f3e0e45b2e46becd534d25ef4a46ea9de937152..35d843078f45c2bb0da741b78492ee7ad7313864 100644 (file)
--- a/host.c
+++ b/host.c
@@ -316,7 +316,7 @@ static void Host_AddConfigText(cmd_state_t *cmd)
                Cbuf_InsertText(cmd, "alias startmap_sp \"map start\"\nalias startmap_dm \"map start\"\nexec teu.rc\n");
        else
                Cbuf_InsertText(cmd, "alias startmap_sp \"map start\"\nalias startmap_dm \"map start\"\nexec " STARTCONFIGFILENAME "\n");
-       Cbuf_Execute(cmd);
+       Cbuf_Execute(cmd->cbuf);
 }
 
 /*
@@ -403,11 +403,8 @@ double Host_Frame(double time)
 
        // process console commands
 //             R_TimeReport("preconsole");
-       Cbuf_Frame(&cmd_client);
-       Cbuf_Frame(&cmd_server);
 
-       if(sv.active)
-               Cbuf_Frame(&cmd_serverfromclient);
+       Cbuf_Frame(host.cbuf);
 
 //             R_TimeReport("console");
 
@@ -436,7 +433,8 @@ double Host_Frame(double time)
 
 static inline void Host_Sleep(double time)
 {
-       double time0, delta;
+       static double delta;
+       double time0;
 
        if(host_maxwait.value <= 0)
                time = min(time, 1000000.0);
@@ -528,8 +526,10 @@ void Host_StartVideo(void)
        if (!vid_opened && cls.state != ca_dedicated)
        {
                vid_opened = true;
+#ifdef WIN32
                // make sure we open sockets before opening video because the Windows Firewall "unblock?" dialog can screw up the graphics context on some graphics drivers
                NetConn_UpdateSockets();
+#endif
                VID_Start();
                CDAudio_Startup();
        }
@@ -733,20 +733,20 @@ static void Host_Init (void)
        if (!FS_FileExists("quake.rc"))
        {
                Cbuf_InsertText(cmd, "exec default.cfg\nexec " CONFIGFILENAME "\nexec autoexec.cfg\n");
-               Cbuf_Execute(cmd);
+               Cbuf_Execute(cmd->cbuf);
        }
 
        host.state = host_active;
 
        // run stuffcmds now, deferred previously because it can crash if a server starts that early
        Cbuf_AddText(cmd,"stuffcmds\n");
-       Cbuf_Execute(cmd);
+       Cbuf_Execute(cmd->cbuf);
 
        Log_Start();
 
        // put up the loading image so the user doesn't stare at a black screen...
        SCR_BeginLoadingPlaque(true);
-       
+
        // 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");
@@ -754,7 +754,7 @@ static void Host_Init (void)
        if (!sv.active && !cls.demoplayback && !cls.connect_trying)
        {
                Cbuf_AddText(&cmd_client, va(vabuf, sizeof(vabuf), "timedemo %s\n", sys.argv[i + 1]));
-               Cbuf_Execute(&cmd_client);
+               Cbuf_Execute((&cmd_client)->cbuf);
        }
 
        // check for special demo mode
@@ -764,7 +764,7 @@ static void Host_Init (void)
        if (!sv.active && !cls.demoplayback && !cls.connect_trying)
        {
                Cbuf_AddText(&cmd_client, va(vabuf, sizeof(vabuf), "playdemo %s\n", sys.argv[i + 1]));
-               Cbuf_Execute(&cmd_client);
+               Cbuf_Execute((&cmd_client)->cbuf);
        }
 
 #ifdef CONFIG_VIDEO_CAPTURE
@@ -774,7 +774,7 @@ static void Host_Init (void)
        if (!sv.active && !cls.demoplayback && !cls.connect_trying)
        {
                Cbuf_AddText(&cmd_client, va(vabuf, sizeof(vabuf), "playdemo %s\ncl_capturevideo 1\n", sys.argv[i + 1]));
-               Cbuf_Execute(&cmd_client);
+               Cbuf_Execute((&cmd_client)->cbuf);
        }
 #endif
 
@@ -782,7 +782,7 @@ static void Host_Init (void)
        if (!sv.active && !cls.demoplayback && !cls.connect_trying)
        {
                Cbuf_AddText(&cmd_client, "startmap_dm\n");
-               Cbuf_Execute(&cmd_client);
+               Cbuf_Execute((&cmd_client)->cbuf);
        }
 
        if (!sv.active && !cls.demoplayback && !cls.connect_trying)
@@ -790,7 +790,7 @@ static void Host_Init (void)
 #ifdef CONFIG_MENU
                Cbuf_AddText(&cmd_client, "togglemenu 1\n");
 #endif
-               Cbuf_Execute(&cmd_client);
+               Cbuf_Execute((&cmd_client)->cbuf);
        }
 
        Con_DPrint("========Initialized=========\n");