X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=host.c;h=c6ffa4aa8a472eabc7e9c0a4686b6b02b366aafb;hb=668a437d46dfad040c8e32398fd7cb916345f7d1;hp=28ff3f1d1bff7bcd16d0ccc91571789f31de4c73;hpb=cbecdc805a8b8d1d5e84dc61caff6092daef22b3;p=xonotic%2Fdarkplaces.git diff --git a/host.c b/host.c index 28ff3f1d..c6ffa4aa 100644 --- a/host.c +++ b/host.c @@ -19,8 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // host.c -- coordinates spawning and killing of local servers -#include "quakedef.h" #include +#include "quakedef.h" +#include "cl_video.h" /* @@ -143,8 +144,6 @@ void Host_Error (char *error, ...) } inerror = true; - SCR_EndLoadingPlaque (); // reenable screen updates - va_start (argptr,error); vsprintf (hosterrorstring,error,argptr); va_end (argptr); @@ -571,11 +570,7 @@ qboolean Host_FilterTime (double time) if (host_framerate.value > 0) host_frametime = host_framerate.value; else if (cl_avidemo.value >= 0.1f) - { - // don't allow really short frames - //if (host_frametime > (1.0 / cl_avidemo.value)) - host_frametime = (1.0 / cl_avidemo.value); - } + host_frametime = (1.0 / cl_avidemo.value); else { // don't allow really short frames @@ -630,7 +625,6 @@ void Host_ServerFrame (void) sv.frametime = 0; frametimetotal = 0; lastservertime = realtime; -// pr_global_struct->frametime = host_frametime; // set the time and clear the general datagram SV_ClearDatagram (); @@ -723,6 +717,8 @@ void _Host_Frame (float time) ui_update(); + CL_VideoFrame(); + // update video if (host_speeds.integer) time1 = Sys_DoubleTime (); @@ -839,7 +835,7 @@ void Host_Init (void) NET_Init (); SV_Init (); - Con_Printf ("Exe: "__TIME__" "__DATE__"\n"); + Con_Printf ("Builddate: %s\n", buildstring); if (cls.state != ca_dedicated) { @@ -891,9 +887,6 @@ void Host_Shutdown(void) } isdown = true; -// keep Con_Printf from trying to update the screen -// scr_disabled_for_loading = true; - Host_WriteConfiguration (); CDAudio_Shutdown ();