renamed varray_ arrays to rsurface_array_, and they are no longer used outside the...

[xonotic/darkplaces.git] / host.c

diff --git a/host.c b/host.c
index 05dcd78a3473481980f979266e1bab4b0d09ed15..c3efe96fc94a3a8ef581acc72e0fedb1aaf18874 100644 (file)
--- a/host.c
+++ b/host.c
@@ -39,7 +39,7 @@ Memory is cleared / released when a server or client begins, not when they end.
 
 // how many frames have occurred
 // (checked by Host_Error and Host_SaveConfig_f)
-int host_framecount;
+int host_framecount = 0;
 // LordHavoc: set when quit is executed
 qboolean host_shuttingdown = false;
 
@@ -51,9 +51,6 @@ double realtime;
 // realtime from previous frame
 double oldrealtime;
 
-// used for -developer commandline parameter, hacky hacky
-int forcedeveloper;
-
 // current client
 client_t *host_client;
 
@@ -243,8 +240,6 @@ void Host_InitLocal (void)
        Cvar_RegisterVariable (&noexit);
        Cvar_RegisterVariable (&skill);
        Cvar_RegisterVariable (&developer);
-       if (forcedeveloper) // make it real now that the cvar is registered
-               Cvar_SetValue("developer", 1);
        Cvar_RegisterVariable (&developer_entityparsing);
        Cvar_RegisterVariable (&deathmatch);
        Cvar_RegisterVariable (&coop);
@@ -524,25 +519,6 @@ void Host_ShutdownServer(void)
 }
 
 
-/*
-================
-Host_ClearMemory
-
-This clears all the memory used by both the client and server, but does
-not reinitialize anything.
-================
-*/
-void Host_ClearMemory (void)
-{
-       Con_DPrint("Clearing memory\n");
-       Mod_ClearAll ();
-
-       cls.signon = 0;
-       memset (&sv, 0, sizeof(sv));
-       memset (&cl, 0, sizeof(cl));
-}
-
-
 //============================================================================
 
 /*
@@ -552,9 +528,6 @@ Host_FilterTime
 Returns false if the time is too short to run a frame
 ===================
 */
-extern qboolean cl_capturevideo_active;
-extern double cl_capturevideo_framerate;
-extern qfile_t *cl_capturevideo_soundfile;
 qboolean Host_FilterTime (double time)
 {
        double timecap, timeleft;
@@ -585,8 +558,8 @@ qboolean Host_FilterTime (double time)
                timecap = sys_ticrate.value;
        if (cls.state != ca_dedicated)
        {
-               if (cl_capturevideo_active)
-                       timecap = 1.0 / cl_capturevideo_framerate;
+               if (cls.capturevideo_active)
+                       timecap = 1.0 / cls.capturevideo_framerate;
                else if (vid_activewindow)
                        timecap = 1.0 / cl_maxfps.value;
        }
@@ -612,7 +585,7 @@ qboolean Host_FilterTime (double time)
        host_realframetime = host_frametime = realtime - oldrealtime;
        oldrealtime = realtime;
 
-       if (cl_capturevideo_active && !cl_capturevideo_soundfile)
+       if (cls.capturevideo_active && !cls.capturevideo_soundfile)
                host_frametime = timecap;
 
        // apply slowmo scaling
@@ -699,8 +672,6 @@ void Host_ServerFrame (void)
                if (sv.paused || (cl.islocalgame && (key_dest != key_game || key_consoleactive)))
                        sv.frametime = 0;
 
-               // set the time and clear the general datagram
-               SV_ClearDatagram();
 
                // move things around and think unless paused
                if (sv.frametime)
@@ -709,6 +680,9 @@ void Host_ServerFrame (void)
                // send all messages to the clients
                SV_SendClientMessages();
 
+               // clear the general datagram
+               SV_ClearDatagram();
+
                // if this server frame took too long, break out of the loop
                if (Sys_DoubleTime() >= aborttime)
                        break;
@@ -912,6 +886,24 @@ void Host_Init (void)
        int i;
        const char* os;
 
+       // FIXME: this is evil, but possibly temporary
+// COMMANDLINEOPTION: Console: -developer enables warnings and other notices (RECOMMENDED for mod developers)
+       if (COM_CheckParm("-developer"))
+       {
+               developer.value = developer.integer = 100;
+               developer.string = "100";
+       }
+
+       if (COM_CheckParm("-developer2"))
+       {
+               developer.value = developer.integer = 100;
+               developer.string = "100";
+               developer_memory.value = developer_memory.integer = 100;
+               developer.string = "100";
+               developer_memorydebug.value = developer_memorydebug.integer = 100;
+               developer_memorydebug.string = "100";
+       }
+
        // LordHavoc: quake never seeded the random number generator before... heh
        srand(time(NULL));
 
@@ -959,15 +951,6 @@ void Host_Init (void)
        else
                Con_Printf("%s\n", engineversion);
 
-       // FIXME: this is evil, but possibly temporary
-// COMMANDLINEOPTION: Console: -developer enables warnings and other notices (RECOMMENDED for mod developers)
-       if (COM_CheckParm("-developer"))
-       {
-               forcedeveloper = true;
-               developer.integer = 1;
-               developer.value = 1;
-       }
-
        // initialize filesystem (including fs_basedir, fs_gamedir, -path, -game, scr_screenshot_name)
        FS_Init();
 
@@ -1016,8 +999,6 @@ void Host_Init (void)
                Cbuf_AddText("alias startmap_sp \"map nehstart\"\nalias startmap_dm \"map nehstart\"\nexec quake.rc\n");
        else if (gamemode == GAME_TRANSFUSION)
                Cbuf_AddText("alias startmap_sp \"map e1m1\"\n""alias startmap_dm \"map bb1\"\nexec quake.rc\n");
-       else if (gamemode == GAME_NEXUIZ)
-               Cbuf_AddText("alias startmap_sp \"map nexdm01\"\nalias startmap_dm \"map nexdm01\"\nexec quake.rc\n");
        else if (gamemode == GAME_TEU)
                Cbuf_AddText("alias startmap_sp \"map start\"\nalias startmap_dm \"map start\"\nexec teu.rc\n");
        else
@@ -1031,12 +1012,11 @@ void Host_Init (void)
                Cbuf_Execute();
        }
 
-       // save console log up to this point to log_file if it was set by configs
-       Log_Start();
+       // put up the loading image so the user doesn't stare at a black screen...
+       SCR_BeginLoadingPlaque();
 
        // FIXME: put this into some neat design, but the menu should be allowed to crash
        // without crashing the whole game, so this should just be a short-time solution
-       Host_StartVideo();
 
        // here comes the not so critical stuff
        if (setjmp(host_abortframe)) {
@@ -1096,7 +1076,7 @@ void Host_Init (void)
 
        Con_DPrint("========Initialized=========\n");
 
-       Host_StartVideo();
+       //Host_StartVideo();
 }