X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=host.c;h=42dca46c48112363dcabc8124e198c1125fa47e0;hp=2c3bcd46ec3681d5c38fc497fe66c2019890c3ef;hb=a79a57664e9b2420bb4b5a06cde2e84b7191e967;hpb=590a07608279a8a21604a83620d77abe9c731796 diff --git a/host.c b/host.c index 2c3bcd46..42dca46c 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,11 +19,13 @@ 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" /* -A server can allways be started, even if the system started out as a client +A server can always be started, even if the system started out as a client to a remote system. A client can NOT be started if the system started as a dedicated server. @@ -32,73 +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 +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_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; -int host_hunklevel; +// current client +client_t *host_client; -int minimum_memory; +jmp_buf host_abortserver; -client_t *host_client; // current client +// 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"}; -jmp_buf host_abortserver; +// print broadcast messages in dedicated mode +cvar_t sv_echobprint = {CVAR_SAVE, "sv_echobprint", "1"}; -byte *host_basepal; -byte *host_colormap; +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 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 pausable = {"pausable","1"}; - -cvar_t temp1 = {"temp1","0"}; +cvar_t temp1 = {0, "temp1","0"}; +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 @@ -114,28 +132,45 @@ Host_Error This shuts down both the client and server ================ */ -void Host_Error (char *error, ...) +char hosterrorstring[4096]; +void Host_Error (const char *error, ...) { - va_list argptr; - char string[1024]; - static qboolean inerror = false; - + va_list argptr; + static qboolean inerror = false; + + // 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); + vsprintf (string,error,argptr); + va_end (argptr); + Sys_Error ("%s", string); + } + if (inerror) - Sys_Error ("Host_Error: recursively entered"); + { + char string[4096]; + va_start (argptr,error); + vsprintf (string,error,argptr); + va_end (argptr); + 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 (string,error,argptr); + vsprintf (hosterrorstring,error,argptr); va_end (argptr); - Con_Printf ("Host_Error: %s\n",string); - + Con_Printf ("Host_Error: %s\n",hosterrorstring); + + PR_Crash(); + if (sv.active) Host_ShutdownServer (false); if (cls.state == ca_dedicated) - Sys_Error ("Host_Error: %s\n",string); // dedicated servers exit + Sys_Error ("Host_Error: %s\n",hosterrorstring); // dedicated servers exit CL_Disconnect (); cls.demonum = -1; @@ -145,55 +180,81 @@ void Host_Error (char *error, ...) 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)); } @@ -205,10 +266,14 @@ 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); @@ -220,6 +285,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); @@ -227,9 +294,10 @@ void Host_InitLocal (void) Cvar_RegisterVariable (&temp1); - Host_FindMaxClients (); - - host_time = 1.0; // so a think at time 0 won't get called + Cvar_RegisterVariable (×tamps); + Cvar_RegisterVariable (&timeformat); + + Host_ServerOptions (); } @@ -242,23 +310,23 @@ Writes key bindings and archived cvars to config.cfg */ void Host_WriteConfiguration (void) { - FILE *f; + QFile *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 = Qopen (va("%s/config.cfg",com_gamedir), "w"); if (!f) { Con_Printf ("Couldn't write config.cfg.\n"); return; } - + Key_WriteBindings (f); Cvar_WriteVariables (f); - fclose (f); + Qclose (f); } } @@ -267,19 +335,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); } @@ -291,22 +359,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); } @@ -339,8 +410,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) @@ -351,14 +422,14 @@ void SV_DropClient (qboolean crash) MSG_WriteByte (&host_client->message, svc_disconnect); NET_SendMessage (host_client->netconnection, &host_client->message); } - - if (host_client->edict && host_client->spawned) + + 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 // this will set the body to a dead frame, among other things saveSelf = pr_global_struct->self; pr_global_struct->self = EDICT_TO_PROG(host_client->edict); - PR_ExecuteProgram (pr_global_struct->ClientDisconnect); + PR_ExecuteProgram (pr_global_struct->ClientDisconnect, "QC function ClientDisconnect is missing"); pr_global_struct->self = saveSelf; } @@ -390,6 +461,8 @@ void SV_DropClient (qboolean crash) MSG_WriteByte (&client->message, host_client - svs.clients); MSG_WriteByte (&client->message, 0); } + + NET_Heartbeat (); } /* @@ -401,23 +474,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 (); + NET_Heartbeat (); // flush any pending messages - like the score!!! - start = Sys_FloatTime(); + start = Sys_DoubleTime(); do { count = 0; @@ -437,7 +514,7 @@ void Host_ShutdownServer(qboolean crash) } } } - if ((Sys_FloatTime() - start) > 3.0) + if ((Sys_DoubleTime() - start) > 3.0) break; } while (count); @@ -459,7 +536,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)); } @@ -474,10 +551,7 @@ not reinitialize anything. void Host_ClearMemory (void) { Con_DPrintf ("Clearing memory\n"); - D_FlushCaches (); Mod_ClearAll (); - if (host_hunklevel) - Hunk_FreeToLowMark (host_hunklevel); cls.signon = 0; memset (&sv, 0, sizeof(sv)); @@ -494,26 +568,63 @@ 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 (!cls.timedemo && realtime - oldrealtime < (1.0 / 72.0)) -// return false; // framerate is too high + if (slowmo.value < 0.0f) + Cvar_SetValue("slowmo", 0.0f); + if (host_minfps.value < 10.0f) + 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); + + // 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; + + if ((realtime - oldrealtime) < timecap) + return false; + } - host_frametime = (realtime - oldrealtime) * slowmo.value; // LordHavoc: slowmo cvar + // LordHavoc: copy into host_realframetime as well + host_realframetime = host_frametime = realtime - oldrealtime; oldrealtime = realtime; + if (cls.timedemo) + { + // 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 long or short frames - if (host_frametime > 0.1) - host_frametime = 0.1; - if (host_frametime < 0.001) - host_frametime = 0.001; + { + // don't allow really short frames + if (host_frametime > (1.0 / host_minfps.value)) + host_frametime = (1.0 / host_minfps.value); } - + + cl.frametime = host_frametime = bound(0, host_frametime * slowmo.value, 0.1f); // LordHavoc: the QC code relies on no less than 10fps + return true; } @@ -527,7 +638,7 @@ Add them exactly as if they had been typed at the console */ void Host_GetConsoleCommands (void) { - char *cmd; + char *cmd; while (1) { @@ -545,106 +656,39 @@ Host_ServerFrame ================== */ -#ifdef FPS_20 - -void _Host_ServerFrame (void) -{ -// run the world state - pr_global_struct->frametime = host_frametime; - -// 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) ) - SV_Physics (); -} - -void Host_ServerFrame (void) -{ - float save_host_frametime; - float temp_host_frametime; - static float host_serverframe_timevalue; - -// run the world state - pr_global_struct->frametime = host_frametime; - -// set the time and clear the general datagram - SV_ClearDatagram (); - -// check for new clients - SV_CheckForNewClients (); - - temp_host_frametime = save_host_frametime = host_frametime; - // LordHavoc: the results of my attempts to mangle this code to process no more than sys_ticrate, - // when I found that was too choppy, I changed it back to processing at least 20fps, - // I consider it a bit of a failure... because I felt a little out of control in singleplayer - // (sliding around) - //if (host_serverframe_timevalue < -0.2) // don't let it get way out of range - // host_serverframe_timevalue = -0.2; - //host_serverframe_timevalue += host_frametime; - // process frames (several if rendering is too slow to run well as a server) - while(temp_host_frametime > 0.0) - { - host_frametime = temp_host_frametime; - if (host_frametime > 0.05) - host_frametime = 0.05; - temp_host_frametime -= host_frametime; - // host_serverframe_timevalue -= host_frametime; - _Host_ServerFrame (); - } - host_frametime = save_host_frametime; - -// send all messages to the clients - SV_SendClientMessages (); -// LordHavoc: sadly, this didn't look good to the person running the server in listen mode - /* -// wait until enough time has built up when the framerate exceeds sys_ticrate - if (host_serverframe_timevalue >= sys_ticrate.value) - //{ - // while(host_serverframe_timevalue >= sys_ticrate.value) - // host_serverframe_timevalue -= sys_ticrate.value; -// send all messages to the clients - SV_SendClientMessages (); - } - */ -} - -#else - -double frametimetotal = 0, lastservertime = 0; 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 - 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; -// pr_global_struct->frametime = host_frametime; + lastservertime = realtime; // 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 (); } -#endif - /* ================== @@ -655,21 +699,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 // 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 (); @@ -684,7 +732,7 @@ void _Host_Frame (float time) // if running the server locally, make intentions now if (sv.active) CL_SendCmd (); - + //------------------- // // server operations @@ -693,7 +741,7 @@ void _Host_Frame (float time) // check for commands typed to the host Host_GetConsoleCommands (); - + if (sv.active) Host_ServerFrame (); @@ -708,63 +756,66 @@ 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)*1000; - time3 = Sys_FloatTime (); - pass2 = (time2 - time1)*1000; - pass3 = (time3 - time2)*1000; - Con_Printf ("%3i tot %3i server %3i gfx %3i snd\n", + pass1 = (time1 - time3)*1000000; + 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++; @@ -787,144 +838,74 @@ void Host_Frame (float time) //============================================================================ - -extern int vcrFile; -#define VCR_SIGNATURE 0x56435231 -// "VCR1" - -void Host_InitVCR (quakeparms_t *parms) -{ - int i, len, n; - char *p; - - if (COM_CheckParm("-playback")) - { - if (com_argc != 2) - Sys_Error("No other parameters allowed with -playback\n"); - - Sys_FileOpenRead("quake.vcr", &vcrFile); - if (vcrFile == -1) - Sys_Error("playback file not found\n"); - - Sys_FileRead (vcrFile, &i, sizeof(int)); - if (i != VCR_SIGNATURE) - Sys_Error("Invalid signature in vcr file\n"); - - Sys_FileRead (vcrFile, &com_argc, sizeof(int)); - com_argv = malloc(com_argc * sizeof(char *)); - com_argv[0] = parms->argv[0]; - for (i = 0; i < com_argc; i++) - { - Sys_FileRead (vcrFile, &len, sizeof(int)); - p = malloc(len); - Sys_FileRead (vcrFile, p, len); - com_argv[i+1] = p; - } - com_argc++; /* add one for arg[0] */ - parms->argc = com_argc; - parms->argv = com_argv; - } - - if ( (n = COM_CheckParm("-record")) != 0) - { - vcrFile = Sys_FileOpenWrite("quake.vcr"); - - i = VCR_SIGNATURE; - Sys_FileWrite(vcrFile, &i, sizeof(int)); - i = com_argc - 1; - Sys_FileWrite(vcrFile, &i, sizeof(int)); - for (i = 1; i < com_argc; i++) - { - if (i == n) - { - len = 10; - Sys_FileWrite(vcrFile, &len, sizeof(int)); - Sys_FileWrite(vcrFile, "-playback", len); - continue; - } - len = strlen(com_argv[i]) + 1; - Sys_FileWrite(vcrFile, &len, sizeof(int)); - Sys_FileWrite(vcrFile, com_argv[i], len); - } - } - -} +void Render_Init(void); +void QuakeIO_Init(void); /* ==================== Host_Init ==================== */ -void Host_Init (quakeparms_t *parms) +void Host_Init (void) { + // LordHavoc: quake never seeded the random number generator before... heh + srand(time(NULL)); - if (standard_quake) - minimum_memory = MINIMUM_MEMORY; - else - minimum_memory = MINIMUM_MEMORY_LEVELPAK; - - if (COM_CheckParm ("-minmemory")) - parms->memsize = minimum_memory; - - host_parms = *parms; - - if (parms->memsize < minimum_memory) - Sys_Error ("Only %4.1f megs of memory available, can't execute game", parms->memsize / (float)0x100000); - - com_argc = parms->argc; - com_argv = parms->argv; + // FIXME: this is evil, but possibly temporary + if (COM_CheckParm("-developer")) + { + forcedeveloper = true; + developer.integer = 1; + developer.value = 1; + } - Memory_Init (parms->membase, parms->memsize); + Cmd_Init (); + Memory_Init_Commands(); + R_Modules_Init(); Cbuf_Init (); - Cmd_Init (); + QuakeIO_Init (); V_Init (); - Chase_Init (); - Host_InitVCR (parms); - COM_Init (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",parms->memsize/ (1024*1024.0)); - - R_InitTextures (); // needed even for dedicated servers - + Con_Printf ("Builddate: %s\n", buildstring); + if (cls.state != ca_dedicated) { - host_basepal = (byte *)COM_LoadHunkFile ("gfx/palette.lmp", false); - if (!host_basepal) - Sys_Error ("Couldn't load gfx/palette.lmp"); - host_colormap = (byte *)COM_LoadHunkFile ("gfx/colormap.lmp", false); - if (!host_colormap) - Sys_Error ("Couldn't load gfx/colormap.lmp"); + VID_InitCvars(); + + Gamma_Init(); + + Palette_Init(); #ifndef _WIN32 // on non win32, mouse comes before video for security reasons IN_Init (); #endif - VID_Init (host_basepal); - - Draw_Init (); - SCR_Init (); - R_Init (); -#ifndef _WIN32 - // on Win32, sound initialization has to come before video initialization, so we - // can put up a popup if the sound hardware is in use - S_Init (); -#else + VID_Init(); + if (!VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer)) + { + if (vid_fullscreen.integer) + { + if (!VID_Mode(true, 640, 480, 16)) + if (!VID_Mode(false, 640, 480, 16)) + Sys_Error("Video modes failed\n"); + } + else + Sys_Error("Requested windowed video mode failed\n"); + } - // FIXME: doesn't use the new one-window approach yet + Render_Init(); S_Init (); - -#endif // _WIN32 CDAudio_Init (); - Sbar_Init (); CL_Init (); #ifdef _WIN32 // on non win32, mouse comes before video for security reasons IN_Init (); @@ -933,9 +914,6 @@ void Host_Init (quakeparms_t *parms) Cbuf_InsertText ("exec quake.rc\n"); - Hunk_AllocName (0, "-HOST_HUNKLEVEL-"); - host_hunklevel = Hunk_LowMark (); - host_initialized = true; Sys_Printf ("========Quake Initialized=========\n"); @@ -961,9 +939,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 (); @@ -973,6 +948,7 @@ void Host_Shutdown(void) if (cls.state != ca_dedicated) { + R_Modules_Shutdown(); VID_Shutdown(); } }