... forgot to add the files, I'm too used to git now :P

[xonotic/darkplaces.git] / host.c

diff --git a/host.c b/host.c
index a5bca7369eff93ef71fb0fe064bcd7b5cf290230..67ab1b57f4c67dc6b92d938ecf27cee6c17d2657 100644 (file)
--- a/host.c
+++ b/host.c
@@ -770,7 +770,10 @@ void Host_Main(void)
                                        aborttime = realtime + 0.1;
                                }
                        }
-                       advancetime = min(advancetime, 0.1);
+                       if(slowmo.value > 0 && slowmo.value < 1)
+                               advancetime = min(advancetime, 0.1 / slowmo.value);
+                       else
+                               advancetime = min(advancetime, 0.1);
 
                        if(advancetime > 0)
                        {
@@ -827,7 +830,7 @@ void Host_Main(void)
        //
        //-------------------
 
-               if (cls.state != ca_dedicated && (cl_timer > 0 || cls.timedemo || cl_maxfps.value < 1))
+               if (cls.state != ca_dedicated && (cl_timer > 0 || cls.timedemo || ((vid_activewindow ? cl_maxfps : cl_maxidlefps).value < 1)))
                {
                        // decide the simulation time
                        if (cls.capturevideo.active)
@@ -935,6 +938,9 @@ void Host_Main(void)
 
 #if MEMPARANOIA
                Mem_CheckSentinelsGlobal();
+#else
+               if (developer_memorydebug.integer)
+                       Mem_CheckSentinelsGlobal();
 #endif
 
                // if there is some time remaining from this frame, reset the timers
@@ -969,6 +975,7 @@ char engineversion[128];
 
 qboolean sys_nostdout = false;
 
+extern void u8_Init(void);
 extern void Render_Init(void);
 extern void Mathlib_Init(void);
 extern void FS_Init(void);
@@ -1036,6 +1043,7 @@ static void Host_Init (void)
        Con_Init();
 
        // initialize various cvars that could not be initialized earlier
+       u8_Init();
        Curl_Init_Commands();
        Cmd_Init_Commands();
        Sys_Init_Commands();