cleaned up R_RenderView setup code a bit, and shuffled SCR_CalcRefdef stuff to SCR_Up...

[xonotic/darkplaces.git] / host.c

diff --git a/host.c b/host.c
index 826d6e0b6d803bf9fcda7f76d6395809dbdaa02c..299ecad647d35f18df6ac0686fade1dcb23977de 100644 (file)
--- a/host.c
+++ b/host.c
@@ -132,11 +132,10 @@ 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;
-extern char sv_spawnmap[MAX_QPATH];
-extern char sv_loadgame[MAX_OSPATH];
 void Host_Error (const char *error, ...)
 {
        va_list argptr;
@@ -158,10 +157,6 @@ void Host_Error (const char *error, ...)
 
        strcpy(hosterrorstring2, hosterrorstring1);
 
-       // make sure we don't get in a loading loop
-       sv_loadgame[0] = 0;
-       sv_spawnmap[0] = 0;
-
        CL_Parse_DumpPacket();
 
        PR_Crash();
@@ -171,6 +166,8 @@ void Host_Error (const char *error, ...)
        // crash all prvm progs
        PRVM_CrashAll();
 
+       PRVM_ProcessError();
+
        if (sv.active)
                Host_ShutdownServer (false);
 
@@ -256,9 +253,12 @@ void Host_ServerOptions (void)
 Host_InitLocal
 ======================
 */
+void Host_SaveConfig_f(void);
 void Host_InitLocal (void)
 {
        Host_InitCommands ();
+       
+       Cmd_AddCommand("saveconfig", Host_SaveConfig_f);
 
        Cvar_RegisterVariable (&host_framerate);
        Cvar_RegisterVariable (&host_speeds);
@@ -296,12 +296,12 @@ void Host_InitLocal (void)
 
 /*
 ===============
-Host_WriteConfiguration
+Host_SaveConfig_f
 
 Writes key bindings and archived cvars to config.cfg
 ===============
 */
-void Host_WriteConfiguration (void)
+void Host_SaveConfig_f(void)
 {
        qfile_t *f;
 
@@ -564,17 +564,20 @@ qboolean Host_FilterTime (double time)
                // default to sys_ticrate (server framerate - presumably low) unless we
                // have a good reason to run faster
                timecap = sys_ticrate.value;
-               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 (cls.state != ca_dedicated)
+               {
+                       if (cl_avidemo.value >= 0.1f)
+                               timecap = 1.0 / (double)cl_avidemo.value;
+                       else if (vid_activewindow)
+                               timecap = 1.0 / host_maxfps.value;
+               }
 
                timeleft = oldrealtime + timecap - realtime;
                if (timeleft > 0)
                {
                        // don't totally hog the CPU
                        if (timeleft >= 0.02)
-                               Sys_Sleep();
+                               Sys_Sleep((int)(timeleft * 1000) - 5);
                        return false;
                }
        }
@@ -684,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
@@ -703,15 +707,15 @@ 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();
 
-       // LordHavoc: map and load are delayed until video is initialized
-       Host_PerformSpawnServerAndLoadGame();
-
        // if running the server locally, make intentions now
        if (cls.state == ca_connected && sv.active)
-               CL_SendCmd();
+               CL_SendCmd(&cmd);
 
 //-------------------
 //
@@ -741,11 +745,11 @@ 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();
        }
 
-       ui_update();
+       //ui_update();
 
        CL_VideoFrame();
 
@@ -753,18 +757,19 @@ void _Host_Frame (float time)
        if (host_speeds.integer)
                time1 = Sys_DoubleTime();
 
+       R_UpdateWorld();
        CL_UpdateScreen();
 
        if (host_speeds.integer)
                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);
@@ -784,8 +789,6 @@ void _Host_Frame (float time)
        host_framecount++;
        host_loopactive = true;
 
-       if(vec3_origin[0] || vec3_origin[1] || vec3_origin[2])
-               Con_Print("vec3_origin modified !\n");
 }
 
 void Host_Frame (float time)
@@ -827,7 +830,6 @@ void Host_Frame (float time)
 //============================================================================
 
 void Render_Init(void);
-void M_Scipt_Init ();
 
 /*
 ====================
@@ -856,10 +858,8 @@ void Host_Init (void)
        Host_InitLocal();
        Key_Init();
        Con_Init();
-       Chase_Init();
        PR_Init();
        PRVM_Init();
-       MR_Init();
        Mod_Init();
        NetConn_Init();
        SV_Init();
@@ -878,10 +878,8 @@ void Host_Init (void)
                CL_Init();
        }
 
-       Cbuf_InsertText ("exec quake.rc\n");
-       Cbuf_Execute();
-       Cbuf_Execute();
-       Cbuf_Execute();
+       // only cvars are executed when host_initialized == false
+       Cbuf_InsertText("exec quake.rc\n");
        Cbuf_Execute();
 
        host_initialized = true;
@@ -892,7 +890,13 @@ void Host_Init (void)
        {
                VID_Open();
                SCR_BeginLoadingPlaque();
+               MR_Init();
        }
+
+       // stuff it again so the first host frame will execute it again, this time
+       // in its entirety
+       Cbuf_InsertText("exec quake.rc\n");
+       Cbuf_Execute();
 }
 
 
@@ -916,13 +920,14 @@ void Host_Shutdown(void)
        isdown = true;
 
        // Shutdown menu
-       MR_Shutdown();
+       if(MR_Shutdown)
+               MR_Shutdown();
 
        // AK shutdown PRVM
        // AK hmm, no PRVM_Shutdown(); yet
-       
 
-       Host_WriteConfiguration ();
+
+       Host_SaveConfig_f();
 
        CDAudio_Shutdown ();
        NetConn_Shutdown ();