X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=host.c;h=465545ad74c7f7ac088537e0d80f5c2ae1c1e202;hb=3781ea12c92801177ab06db1a816de94c6bc696c;hp=92177df244b45274d034cee4867bd66a11eb2cda;hpb=1fabf30e345d615ffa9ea8ae6cb39aba0f88d4d2;p=xonotic%2Fdarkplaces.git diff --git a/host.c b/host.c index 92177df2..465545ad 100644 --- a/host.c +++ b/host.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -19,7 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // host.c -- coordinates spawning and killing of local servers +#include #include "quakedef.h" +#include "cl_video.h" /* @@ -32,78 +34,89 @@ Memory is cleared / released when a server or client begins, not when they end. */ -quakeparms_t host_parms; +// true if into command execution +qboolean host_initialized; +// LordHavoc: used to turn Host_Error into Sys_Error if starting up or shutting down +qboolean host_loopactive = false; +// LordHavoc: set when quit is executed +qboolean host_shuttingdown = false; -qboolean host_initialized; // true if into command execution -qboolean hostloopactive = 0; // LordHavoc: used to turn Host_Error into Sys_Error if Host_Frame has not yet run +double host_frametime; +// LordHavoc: the real frametime, before slowmo and clamping are applied (used for console scrolling) +double host_realframetime; +// the real time, without any slowmo or clamping +double realtime; +// realtime from previous frame +double oldrealtime; +// how many frames have occurred +int host_framecount; -double host_frametime; -double host_realframetime; // LordHavoc: the real frametime, before slowmo and clamping are applied (used for console scrolling) -double host_time; -double realtime; // without any filtering or bounding -double oldrealtime; // last frame run -int host_framecount; +// used for -developer commandline parameter, hacky hacky +int forcedeveloper; -double sv_frametime; +// current client +client_t *host_client; -int host_hunklevel; +jmp_buf host_abortserver; -int minimum_memory; +// pretend frames take this amount of time (in seconds), 0 = realtime +cvar_t host_framerate = {0, "host_framerate","0"}; +// shows time used by certain subsystems +cvar_t host_speeds = {0, "host_speeds","0"}; +// LordHavoc: framerate independent slowmo +cvar_t slowmo = {0, "slowmo", "1.0"}; +// LordHavoc: game logic lower cap on framerate (if framerate is below this is, it pretends it is this, so game logic will run normally) +cvar_t host_minfps = {CVAR_SAVE, "host_minfps", "10"}; +// LordHavoc: framerate upper cap +cvar_t host_maxfps = {CVAR_SAVE, "host_maxfps", "1000"}; -client_t *host_client; // current client +// print broadcast messages in dedicated mode +cvar_t sv_echobprint = {CVAR_SAVE, "sv_echobprint", "1"}; -jmp_buf host_abortserver; +cvar_t sys_ticrate = {CVAR_SAVE, "sys_ticrate","0.05"}; +cvar_t serverprofile = {0, "serverprofile","0"}; -cvar_t host_framerate = {"host_framerate","0"}; // set for slow motion -cvar_t host_speeds = {"host_speeds","0"}; // set for running times -cvar_t slowmo = {"slowmo", "1.0"}; // LordHavoc: framerate independent slowmo -cvar_t host_minfps = {"host_minfps", "10"}; // LordHavoc: game logic lower cap on framerate (if framerate is below this is, it pretends it is this, so game logic will run normally) -cvar_t host_maxfps = {"host_maxfps", "1000"}; // LordHavoc: framerate upper cap +cvar_t fraglimit = {CVAR_NOTIFY, "fraglimit","0"}; +cvar_t timelimit = {CVAR_NOTIFY, "timelimit","0"}; +cvar_t teamplay = {CVAR_NOTIFY, "teamplay","0"}; -cvar_t sys_ticrate = {"sys_ticrate","0.05"}; -cvar_t serverprofile = {"serverprofile","0"}; +cvar_t samelevel = {0, "samelevel","0"}; +cvar_t noexit = {CVAR_NOTIFY, "noexit","0"}; -cvar_t fraglimit = {"fraglimit","0",false,true}; -cvar_t timelimit = {"timelimit","0",false,true}; -cvar_t teamplay = {"teamplay","0",false,true}; +cvar_t developer = {0, "developer","0"}; -cvar_t samelevel = {"samelevel","0"}; -cvar_t noexit = {"noexit","0",false,true}; +cvar_t skill = {0, "skill","1"}; +cvar_t deathmatch = {0, "deathmatch","0"}; +cvar_t coop = {0, "coop","0"}; -cvar_t developer = {"developer","0"}; +cvar_t pausable = {0, "pausable","1"}; -cvar_t skill = {"skill","1"}; // 0 - 3 -cvar_t deathmatch = {"deathmatch","0"}; // 0, 1, or 2 -cvar_t coop = {"coop","0"}; // 0 or 1 +cvar_t temp1 = {0, "temp1","0"}; -cvar_t pausable = {"pausable","1"}; - -cvar_t temp1 = {"temp1","0"}; - -cvar_t timestamps = {"timestamps", "0", true}; -cvar_t timeformat = {"timeformat", "[%b %e %X] ", true}; +cvar_t timestamps = {CVAR_SAVE, "timestamps", "0"}; +cvar_t timeformat = {CVAR_SAVE, "timeformat", "[%b %e %X] "}; /* ================ Host_EndGame ================ */ -void Host_EndGame (char *message, ...) +void Host_EndGame (const char *format, ...) { - va_list argptr; - char string[1024]; - - va_start (argptr,message); - vsprintf (string,message,argptr); + va_list argptr; + char string[1024]; + + va_start (argptr,format); + vsprintf (string,format,argptr); va_end (argptr); Con_DPrintf ("Host_EndGame: %s\n",string); - + if (sv.active) Host_ShutdownServer (false); if (cls.state == ca_dedicated) Sys_Error ("Host_EndGame: %s\n",string); // dedicated servers exit - + if (cls.demonum != -1) CL_NextDemo (); else @@ -120,14 +133,20 @@ This shuts down both the client and server ================ */ char hosterrorstring[4096]; -extern qboolean hostloopactive; -void Host_Error (char *error, ...) +extern char sv_spawnmap[MAX_QPATH]; +extern char sv_loadgame[MAX_OSPATH]; +void Host_Error (const char *error, ...) { - va_list argptr; - static qboolean inerror = false; + va_list argptr; + static qboolean inerror = false; + + // make sure we don't get in a loading loop + sv_loadgame[0] = 0; + sv_spawnmap[0] = 0; - // LordHavoc: if host_frame loop has not been run yet, do a Sys_Error instead - if (!hostloopactive) + // LordHavoc: if first frame has not been shown, or currently shutting + // down, do Sys_Error instead + if (!host_loopactive || host_shuttingdown) { char string[4096]; va_start (argptr,error); @@ -145,14 +164,16 @@ void Host_Error (char *error, ...) Sys_Error ("Host_Error: recursively entered (original error was: %s new error is: %s)", hosterrorstring, string); } inerror = true; - - SCR_EndLoadingPlaque (); // reenable screen updates va_start (argptr,error); vsprintf (hosterrorstring,error,argptr); va_end (argptr); Con_Printf ("Host_Error: %s\n",hosterrorstring); - + + CL_Parse_DumpPacket(); + + PR_Crash(); + if (sv.active) Host_ShutdownServer (false); @@ -162,60 +183,89 @@ void Host_Error (char *error, ...) CL_Disconnect (); cls.demonum = -1; + // unload any partially loaded models + Mod_ClearErrorModels(); + inerror = false; longjmp (host_abortserver, 1); } -/* -================ -Host_FindMaxClients -================ -*/ -void Host_FindMaxClients (void) +void Host_ServerOptions (void) { - int i; + int i, numplayers; - svs.maxclients = 1; - - i = COM_CheckParm ("-dedicated"); - if (i) + if (cl_available) { - cls.state = ca_dedicated; - if (i != (com_argc - 1)) + // client exists, check what mode the user wants + i = COM_CheckParm ("-dedicated"); + if (i) { - svs.maxclients = atoi (com_argv[i+1]); + cls.state = ca_dedicated; + numplayers = 8; + if (i != (com_argc - 1)) + numplayers = atoi (com_argv[i+1]); + if (COM_CheckParm ("-listen")) + Sys_Error ("Only one of -dedicated or -listen can be specified"); } else - svs.maxclients = 8; + { + numplayers = 1; + cls.state = ca_disconnected; + i = COM_CheckParm ("-listen"); + if (i) + { + numplayers = 8; + if (i != (com_argc - 1)) + numplayers = atoi (com_argv[i+1]); + } + } } else - cls.state = ca_disconnected; - - i = COM_CheckParm ("-listen"); - if (i) { - if (cls.state == ca_dedicated) - Sys_Error ("Only one of -dedicated or -listen can be specified"); - if (i != (com_argc - 1)) - svs.maxclients = atoi (com_argv[i+1]); - else - svs.maxclients = 8; + // no client in the executable, start dedicated server + if (COM_CheckParm ("-listen")) + Sys_Error ("-listen not available in a dedicated server executable"); + numplayers = 8; + cls.state = ca_dedicated; + // check for -dedicated specifying how many players + i = COM_CheckParm ("-dedicated"); + if (i && i != (com_argc - 1)) + numplayers = atoi (com_argv[i+1]); } - if (svs.maxclients < 1) - svs.maxclients = 8; - else if (svs.maxclients > MAX_SCOREBOARD) - svs.maxclients = MAX_SCOREBOARD; - - svs.maxclientslimit = svs.maxclients; - if (svs.maxclientslimit < MAX_SCOREBOARD) // LordHavoc: upped listen mode limit from 4 to MAX_SCOREBOARD - svs.maxclientslimit = MAX_SCOREBOARD; - svs.clients = Hunk_AllocName (svs.maxclientslimit*sizeof(client_t), "clients"); - - if (svs.maxclients > 1) - Cvar_SetValue ("deathmatch", 1.0); + + if (numplayers < 1) + numplayers = 8; + if (numplayers > MAX_SCOREBOARD) + numplayers = MAX_SCOREBOARD; + + // Transfusion doesn't support single player games + if (gamemode == GAME_TRANSFUSION && numplayers < 4) + numplayers = 4; + + if (numplayers > 1) + Cvar_SetValueQuick (&deathmatch, 1); else - Cvar_SetValue ("deathmatch", 0.0); + Cvar_SetValueQuick (&deathmatch, 0); + + svs.maxclients = 0; + SV_SetMaxClients(numplayers); +} + +static mempool_t *clients_mempool; +void SV_SetMaxClients(int n) +{ + if (sv.active) + return; + n = bound(1, n, MAX_SCOREBOARD); + if (svs.maxclients == n) + return; + svs.maxclients = n; + if (!clients_mempool) + clients_mempool = Mem_AllocPool("clients"); + if (svs.clients) + Mem_Free(svs.clients); + svs.clients = Mem_Alloc(clients_mempool, svs.maxclients*sizeof(client_t)); } @@ -227,13 +277,15 @@ Host_InitLocal void Host_InitLocal (void) { Host_InitCommands (); - + Cvar_RegisterVariable (&host_framerate); Cvar_RegisterVariable (&host_speeds); Cvar_RegisterVariable (&slowmo); Cvar_RegisterVariable (&host_minfps); Cvar_RegisterVariable (&host_maxfps); + Cvar_RegisterVariable (&sv_echobprint); + Cvar_RegisterVariable (&sys_ticrate); Cvar_RegisterVariable (&serverprofile); @@ -244,6 +296,8 @@ 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 (&deathmatch); Cvar_RegisterVariable (&coop); @@ -254,9 +308,7 @@ void Host_InitLocal (void) Cvar_RegisterVariable (×tamps); Cvar_RegisterVariable (&timeformat); - Host_FindMaxClients (); - - host_time = 1.0; // so a think at time 0 won't get called + Host_ServerOptions (); } @@ -269,23 +321,23 @@ Writes key bindings and archived cvars to config.cfg */ void Host_WriteConfiguration (void) { - FILE *f; + qfile_t *f; // dedicated servers initialize the host but don't parse and set the // config.cfg cvars - if (host_initialized & !isDedicated) + if (host_initialized && cls.state != ca_dedicated) { - f = fopen (va("%s/config.cfg",com_gamedir), "w"); + f = FS_Open ("config.cfg", "w", false); if (!f) { Con_Printf ("Couldn't write config.cfg.\n"); return; } - + Key_WriteBindings (f); Cvar_WriteVariables (f); - fclose (f); + FS_Close (f); } } @@ -294,19 +346,19 @@ void Host_WriteConfiguration (void) ================= SV_ClientPrintf -Sends text across to be displayed +Sends text across to be displayed FIXME: make this just a stuffed echo? ================= */ -void SV_ClientPrintf (char *fmt, ...) +void SV_ClientPrintf (const char *fmt, ...) { - va_list argptr; - char string[1024]; - + va_list argptr; + char string[1024]; + va_start (argptr,fmt); vsprintf (string, fmt,argptr); va_end (argptr); - + MSG_WriteByte (&host_client->message, svc_print); MSG_WriteString (&host_client->message, string); } @@ -318,22 +370,25 @@ SV_BroadcastPrintf Sends text to all active clients ================= */ -void SV_BroadcastPrintf (char *fmt, ...) +void SV_BroadcastPrintf (const char *fmt, ...) { - va_list argptr; - char string[1024]; - int i; - + va_list argptr; + char string[1024]; + int i; + va_start (argptr,fmt); vsprintf (string, fmt,argptr); va_end (argptr); - + for (i=0 ; imessage, svc_stufftext); MSG_WriteString (&host_client->message, string); } @@ -366,8 +421,8 @@ if (crash = true), don't bother sending signofs */ void SV_DropClient (qboolean crash) { - int saveSelf; - int i; + int saveSelf; + int i; client_t *client; if (!crash) @@ -378,7 +433,7 @@ void SV_DropClient (qboolean crash) MSG_WriteByte (&host_client->message, svc_disconnect); NET_SendMessage (host_client->netconnection, &host_client->message); } - + if (sv.active && host_client->edict && host_client->spawned) // LordHavoc: don't call QC if server is dead (avoids recursive Host_Error in some mods when they run out of edicts) { // call the prog function for removing a client @@ -417,6 +472,8 @@ void SV_DropClient (qboolean crash) MSG_WriteByte (&client->message, host_client - svs.clients); MSG_WriteByte (&client->message, 0); } + + NET_Heartbeat (1); } /* @@ -428,23 +485,27 @@ This only happens at the end of a game, not between levels */ void Host_ShutdownServer(qboolean crash) { - int i; - int count; - sizebuf_t buf; - char message[4]; - double start; + int i, count; + sizebuf_t buf; + char message[4]; + double start; if (!sv.active) return; + // print out where the crash happened, if it was caused by QC + PR_Crash(); + sv.active = false; // stop all client sounds immediately - if (cls.state == ca_connected) - CL_Disconnect (); + CL_Disconnect (); + + NET_Heartbeat (2); + NET_Heartbeat (2); // flush any pending messages - like the score!!! - start = Sys_FloatTime(); + start = Sys_DoubleTime(); do { count = 0; @@ -464,7 +525,7 @@ void Host_ShutdownServer(qboolean crash) } } } - if ((Sys_FloatTime() - start) > 3.0) + if ((Sys_DoubleTime() - start) > 3.0) break; } while (count); @@ -486,7 +547,7 @@ void Host_ShutdownServer(qboolean crash) // clear structures // memset (&sv, 0, sizeof(sv)); - memset (svs.clients, 0, svs.maxclientslimit*sizeof(client_t)); + memset (svs.clients, 0, svs.maxclients * sizeof(client_t)); } @@ -502,8 +563,6 @@ void Host_ClearMemory (void) { Con_DPrintf ("Clearing memory\n"); Mod_ClearAll (); - if (host_hunklevel) - Hunk_FreeToLowMark (host_hunklevel); cls.signon = 0; memset (&sv, 0, sizeof(sv)); @@ -520,8 +579,10 @@ Host_FilterTime Returns false if the time is too short to run a frame =================== */ -qboolean Host_FilterTime (float time) +extern cvar_t cl_avidemo; +qboolean Host_FilterTime (double time) { + double timecap; realtime += time; if (slowmo.value < 0.0f) @@ -530,18 +591,42 @@ qboolean Host_FilterTime (float time) Cvar_SetValue("host_minfps", 10.0f); if (host_maxfps.value < host_minfps.value) Cvar_SetValue("host_maxfps", host_minfps.value); + if (cl_avidemo.value < 0.1f && cl_avidemo.value != 0.0f) + Cvar_SetValue("cl_avidemo", 0.0f); - if ((!cls.timedemo) && ((realtime - oldrealtime) < (1.0 / host_maxfps.value))) - return false; // framerate is too high + // check if framerate is too high + if (cl_avidemo.value >= 0.1f) + { + 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 + timecap = sys_ticrate.value; + if (vid_activewindow && (cls.state == ca_connected || cl_videoplaying)) + timecap = 1.0 / host_maxfps.value; - host_realframetime = host_frametime = realtime - oldrealtime; // LordHavoc: copy into host_realframetime as well + if ((realtime - oldrealtime) < timecap) + return false; + } + + // LordHavoc: copy into host_realframetime as well + host_realframetime = host_frametime = realtime - oldrealtime; oldrealtime = realtime; if (cls.timedemo) - return true; // disable time effects + { + // disable time effects + cl.frametime = host_frametime; + return true; + } if (host_framerate.value > 0) host_frametime = host_framerate.value; + else if (cl_avidemo.value >= 0.1f) + host_frametime = (1.0 / cl_avidemo.value); else { // don't allow really short frames @@ -549,9 +634,8 @@ qboolean Host_FilterTime (float time) host_frametime = (1.0 / host_minfps.value); } - host_frametime *= slowmo.value; - cl.frametime = host_frametime; - + cl.frametime = host_frametime = bound(0, host_frametime * slowmo.value, 0.1f); // LordHavoc: the QC code relies on no less than 10fps + return true; } @@ -565,7 +649,7 @@ Add them exactly as if they had been typed at the console */ void Host_GetConsoleCommands (void) { - char *cmd; + char *cmd; while (1) { @@ -588,30 +672,35 @@ void Host_ServerFrame (void) static double frametimetotal = 0, lastservertime = 0; frametimetotal += host_frametime; // LordHavoc: cap server at sys_ticrate in listen games - if (!isDedicated && svs.maxclients > 1 && ((realtime - lastservertime) < sys_ticrate.value)) + if (cls.state != ca_dedicated && svs.maxclients > 1 && ((realtime - lastservertime) < sys_ticrate.value)) return; // run the world state - sv.frametime = pr_global_struct->frametime = frametimetotal; + if (!sv.paused && (svs.maxclients > 1 || (key_dest == key_game && !key_consoleactive))) + sv.frametime = pr_global_struct->frametime = frametimetotal; + else + sv.frametime = 0; frametimetotal = 0; lastservertime = realtime; -// pr_global_struct->frametime = host_frametime; // set the time and clear the general datagram SV_ClearDatagram (); - + // check for new clients SV_CheckForNewClients (); // read client messages SV_RunClients (); - + // move things around and think // always pause in single player if in console or menus - if (!sv.paused && (svs.maxclients > 1 || key_dest == key_game) ) + if (sv.frametime) SV_Physics (); // send all messages to the clients SV_SendClientMessages (); + +// send an heartbeat if enough time has passed since the last one + NET_Heartbeat (0); } @@ -624,22 +713,25 @@ Runs all active servers */ void _Host_Frame (float time) { - static double time1 = 0; - static double time2 = 0; - static double time3 = 0; - int pass1, pass2, pass3; + static double time1 = 0; + static double time2 = 0; + static double time3 = 0; + int pass1, pass2, pass3; if (setjmp (host_abortserver) ) return; // something bad happened, or the server disconnected - hostloopactive = 1; // keep the random time dependent rand (); - + // decide the simulation time if (!Host_FilterTime (time)) - return; // don't run too fast, or packets will flood out - + { + // if time was rejected, don't totally hog the CPU + Sys_Sleep(); + return; + } + // get new key events Sys_SendKeyEvents (); @@ -649,12 +741,15 @@ void _Host_Frame (float time) // process console commands Cbuf_Execute (); + // LordHavoc: map and load are delayed until video is initialized + Host_PerformSpawnServerAndLoadGame(); + NET_Poll(); // if running the server locally, make intentions now if (sv.active) CL_SendCmd (); - + //------------------- // // server operations @@ -663,7 +758,7 @@ void _Host_Frame (float time) // check for commands typed to the host Host_GetConsoleCommands (); - + if (sv.active) Host_ServerFrame (); @@ -678,65 +773,70 @@ void _Host_Frame (float time) if (!sv.active) CL_SendCmd (); - host_time += host_frametime; - // fetch results from server if (cls.state == ca_connected) CL_ReadFromServer (); + ui_update(); + + CL_VideoFrame(); + // update video - if (host_speeds.value) - time1 = Sys_FloatTime (); - - SCR_UpdateScreen (); - - if (host_speeds.value) - time2 = Sys_FloatTime (); - + if (host_speeds.integer) + time1 = Sys_DoubleTime (); + + CL_UpdateScreen (); + + if (host_speeds.integer) + time2 = Sys_DoubleTime (); + // update audio if (cls.signon == SIGNONS) { - S_Update (r_origin, vpn, vright, vup); - CL_DecayLights (); + // 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); } else S_Update (vec3_origin, vec3_origin, vec3_origin, vec3_origin); - + CDAudio_Update(); - if (host_speeds.value) + if (host_speeds.integer) { pass1 = (time1 - time3)*1000000; - time3 = Sys_FloatTime (); + time3 = Sys_DoubleTime (); pass2 = (time2 - time1)*1000000; pass3 = (time3 - time2)*1000000; Con_Printf ("%6ius total %6ius server %6ius gfx %6ius snd\n", pass1+pass2+pass3, pass1, pass2, pass3); } - + host_framecount++; + host_loopactive = true; } void Host_Frame (float time) { - double time1, time2; - static double timetotal; - static int timecount; - int i, c, m; + double time1, time2; + static double timetotal; + static int timecount; + int i, c, m; - if (!serverprofile.value) + if (!serverprofile.integer) { _Host_Frame (time); return; } - - time1 = Sys_FloatTime (); + + time1 = Sys_DoubleTime (); _Host_Frame (time); - time2 = Sys_FloatTime (); - + time2 = Sys_DoubleTime (); + timetotal += time2 - time1; timecount++; - + if (timecount < 1000) return; @@ -755,98 +855,69 @@ void Host_Frame (float time) //============================================================================ -void Render_Init(); +void Render_Init(void); /* ==================== Host_Init ==================== */ -void Host_Init () +void Host_Init (void) { - int i; - /* - if (standard_quake) - minimum_memory = MINIMUM_MEMORY; - else - minimum_memory = MINIMUM_MEMORY_LEVELPAK; - - if (COM_CheckParm ("-minmemory")) - host_parms.memsize = minimum_memory; - - if (host_parms.memsize < minimum_memory) - Sys_Error ("Only %4.1f megs of memory available, can't execute game", host_parms.memsize / (float)0x100000); - */ - - host_parms.memsize = DEFAULTMEM * 1024 * 1024; - - i = COM_CheckParm("-mem"); - if (i) - host_parms.memsize = (int) (atof(com_argv[i+1]) * 1024 * 1024); + // LordHavoc: quake never seeded the random number generator before... heh + srand(time(NULL)); - i = COM_CheckParm("-winmem"); - if (i) - host_parms.memsize = (int) (atof(com_argv[i+1]) * 1024 * 1024); - - i = COM_CheckParm("-heapsize"); - if (i) - host_parms.memsize = (int) (atof(com_argv[i+1]) * 1024); - - host_parms.membase = qmalloc(host_parms.memsize); - if (!host_parms.membase) - Sys_Error("Not enough memory free, close some programs and try again, or free disk space\n"); - - com_argc = host_parms.argc; - com_argv = host_parms.argv; + // FIXME: this is evil, but possibly temporary + if (COM_CheckParm("-developer")) + { + forcedeveloper = true; + developer.integer = 1; + developer.value = 1; + } - Memory_Init (host_parms.membase, host_parms.memsize); + Cmd_Init (); + Memory_Init_Commands(); + R_Modules_Init(); Cbuf_Init (); - Cmd_Init (); V_Init (); - Chase_Init (); - COM_Init (host_parms.basedir); + COM_Init (); Host_InitLocal (); W_LoadWadFile ("gfx.wad"); Key_Init (); - Con_Init (); - M_Init (); + Con_Init (); + Chase_Init (); + M_Init (); PR_Init (); Mod_Init (); NET_Init (); SV_Init (); - Con_Printf ("Exe: "__TIME__" "__DATE__"\n"); - Con_Printf ("%4.1f megabyte heap\n",host_parms.memsize/(1024*1024.0)); - - R_InitTextures (); // needed even for dedicated servers - + Con_Printf ("Builddate: %s\n", buildstring); + if (cls.state != ca_dedicated) { - Palette_Init("gfx/palette.lmp"); - -#ifndef _WIN32 // on non win32, mouse comes before video for security reasons - IN_Init (); -#endif - VID_Init (); + Palette_Init(); + VID_Shared_Init(); + VID_Init(); Render_Init(); S_Init (); CDAudio_Init (); - Sbar_Init (); CL_Init (); -#ifdef _WIN32 // on non win32, mouse comes before video for security reasons - IN_Init (); -#endif } Cbuf_InsertText ("exec quake.rc\n"); - - Hunk_AllocName (0, "-HOST_HUNKLEVEL-"); - host_hunklevel = Hunk_LowMark (); + Cbuf_Execute (); + Cbuf_Execute (); + Cbuf_Execute (); + Cbuf_Execute (); host_initialized = true; - - Sys_Printf ("========Quake Initialized=========\n"); + + Con_Printf ("========Quake Initialized=========\n"); + + if (cls.state != ca_dedicated) + VID_Open(); } @@ -861,23 +932,19 @@ to run quit through here before the final handoff to the sys code. void Host_Shutdown(void) { static qboolean isdown = false; - + if (isdown) { - printf ("recursive shutdown\n"); + Con_Printf ("recursive shutdown\n"); return; } isdown = true; -// keep Con_Printf from trying to update the screen - scr_disabled_for_loading = true; - - Host_WriteConfiguration (); + Host_WriteConfiguration (); CDAudio_Shutdown (); NET_Shutdown (); S_Shutdown(); - IN_Shutdown (); if (cls.state != ca_dedicated) {