The menu isnt initialized for dedicated servers

[xonotic/darkplaces.git] / host.c

diff --git a/host.c b/host.c
index e6401a03df4d9c491cfa3cd11b3aa2232a76e561..a50b143067bc655f1d8a847fc92bc8e715790f57 100644 (file)
--- a/host.c
+++ b/host.c
@@ -132,6 +132,7 @@ Host_Error
 This shuts down both the client and server
 ================
 */
+void PRVM_ProcessError(void);
 static char hosterrorstring1[4096];
 static char hosterrorstring2[4096];
 static qboolean hosterror = false;
@@ -166,6 +167,13 @@ void Host_Error (const char *error, ...)
 
        PR_Crash();
 
+       //PRVM_Crash(); // crash current prog
+
+       // crash all prvm progs
+       PRVM_CrashAll();
+
+       PRVM_ProcessError();
+
        if (sv.active)
                Host_ShutdownServer (false);
 
@@ -541,7 +549,7 @@ Returns false if the time is too short to run a frame
 extern cvar_t cl_avidemo;
 qboolean Host_FilterTime (double time)
 {
-       double timecap;
+       double timecap, timeleft;
        realtime += time;
 
        if (slowmo.value < 0.0f)
@@ -554,21 +562,24 @@ qboolean Host_FilterTime (double time)
                Cvar_SetValue("cl_avidemo", 0.0f);
 
        // check if framerate is too high
-       if (cl_avidemo.value >= 0.1f)
+       if (!cls.timedemo)
        {
-               timecap = 1.0 / (double)cl_avidemo.value;
-               if ((realtime - oldrealtime) < timecap)
-                       return false;
-       }
-       else if (!cls.timedemo)
-       {
-               // default to sys_ticrate (server framerate - presumably low) unless we're the active window and either connected to a server or playing a video
+               // default to sys_ticrate (server framerate - presumably low) unless we
+               // have a good reason to run faster
                timecap = sys_ticrate.value;
-               if (vid_activewindow && (cls.state == ca_connected || cl_videoplaying))
+               if (cl_avidemo.value >= 0.1f)
+                       timecap = 1.0 / (double)cl_avidemo.value;
+               else if (vid_activewindow && !scr_con_current)
                        timecap = 1.0 / host_maxfps.value;
 
-               if ((realtime - oldrealtime) < timecap)
+               timeleft = oldrealtime + timecap - realtime;
+               if (timeleft > 0)
+               {
+                       // don't totally hog the CPU
+                       if (timeleft >= 0.02)
+                               Sys_Sleep();
                        return false;
+               }
        }
 
        // LordHavoc: copy into host_realframetime as well
@@ -676,6 +687,7 @@ void _Host_Frame (float time)
        static double time2 = 0;
        static double time3 = 0;
        int pass1, pass2, pass3;
+       usercmd_t cmd; // Used for receiving input
 
        if (setjmp(host_abortserver))
                return;                 // something bad happened, or the server disconnected
@@ -685,11 +697,7 @@ void _Host_Frame (float time)
 
        // decide the simulation time
        if (!Host_FilterTime(time))
-       {
-               // if time was rejected, don't totally hog the CPU
-               Sys_Sleep();
                return;
-       }
 
        cl.islocalgame = NetConn_IsLocalGame();
 
@@ -699,6 +707,9 @@ void _Host_Frame (float time)
        // allow mice or other external controllers to add commands
        IN_Commands();
 
+       // Collect input into cmd
+       IN_ProcessMove(&cmd);
+
        // process console commands
        Cbuf_Execute();
 
@@ -707,7 +718,7 @@ void _Host_Frame (float time)
 
        // if running the server locally, make intentions now
        if (cls.state == ca_connected && sv.active)
-               CL_SendCmd();
+               CL_SendCmd(&cmd);
 
 //-------------------
 //
@@ -737,7 +748,7 @@ void _Host_Frame (float time)
                // if running the server remotely, send intentions now after
                // the incoming messages have been read
                if (!sv.active)
-                       CL_SendCmd();
+                       CL_SendCmd(&cmd);
                CL_ReadFromServer();
        }
 
@@ -755,12 +766,12 @@ void _Host_Frame (float time)
                time2 = Sys_DoubleTime();
 
        // update audio
-       if (cls.signon == SIGNONS)
+       if (cls.signon == SIGNONS && cl.viewentity >= 0 && cl.viewentity < MAX_EDICTS && cl_entities[cl.viewentity].state_current.active)
        {
                // LordHavoc: this used to use renderer variables (eww)
-               vec3_t forward, right, up;
-               AngleVectors(cl.viewangles, forward, right, up);
-               S_Update(cl_entities[cl.viewentity].render.origin, forward, right, up);
+               vec3_t forward, left, up, origin;
+               Matrix4x4_ToVectors(&cl_entities[cl.viewentity].render.matrix, forward, left, up, origin);
+               S_Update(origin, forward, left, up);
        }
        else
                S_Update(vec3_origin, vec3_origin, vec3_origin, vec3_origin);
@@ -779,6 +790,7 @@ void _Host_Frame (float time)
 
        host_framecount++;
        host_loopactive = true;
+
 }
 
 void Host_Frame (float time)
@@ -846,12 +858,10 @@ void Host_Init (void)
        V_Init();
        COM_Init();
        Host_InitLocal();
-       W_LoadWadFile("gfx.wad");
        Key_Init();
        Con_Init();
-       Chase_Init();
-       M_Init();
        PR_Init();
+       PRVM_Init();
        Mod_Init();
        NetConn_Init();
        SV_Init();
@@ -881,7 +891,11 @@ void Host_Init (void)
        Con_DPrintf ("========Initialized=========\n");
 
        if (cls.state != ca_dedicated)
+       {
                VID_Open();
+               MR_Init();
+               SCR_BeginLoadingPlaque();
+       }
 }
 
 
@@ -904,11 +918,18 @@ void Host_Shutdown(void)
        }
        isdown = true;
 
+       // Shutdown menu
+       if(MR_Shutdown)
+               MR_Shutdown();
+
+       // AK shutdown PRVM
+       // AK hmm, no PRVM_Shutdown(); yet
+
+
        Host_WriteConfiguration ();
 
        CDAudio_Shutdown ();
        NetConn_Shutdown ();
-       S_Shutdown();
 
        if (cls.state != ca_dedicated)
        {