X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=host.c;h=3c698965f6d153e251996ceffd43ccbef8c53e9e;hp=93b55015a257c2195e2d90d209cae0d8b3cc1972;hb=9dc8149ee231682452a52a4ec4bdee3981da5492;hpb=a68ee07c9e3faede6dd807dea1ab72d0514abefa diff --git a/host.c b/host.c index 93b55015..3c698965 100644 --- a/host.c +++ b/host.c @@ -21,7 +21,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include "quakedef.h" +#include "cdaudio.h" #include "cl_video.h" +#include "progsvm.h" /* @@ -65,10 +67,8 @@ cvar_t host_framerate = {0, "host_framerate","0"}; 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"}; +cvar_t cl_maxfps = {CVAR_SAVE, "cl_maxfps", "1000"}; // print broadcast messages in dedicated mode cvar_t sv_echobprint = {CVAR_SAVE, "sv_echobprint", "1"}; @@ -96,35 +96,6 @@ 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 (const char *format, ...) -{ - 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 - CL_Disconnect (); - - longjmp (host_abortserver, 1); -} - /* ================ Host_Error @@ -132,20 +103,19 @@ 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; va_start (argptr,error); - vsprintf (hosterrorstring1,error,argptr); + dpvsnprintf (hosterrorstring1,sizeof(hosterrorstring1),error,argptr); va_end (argptr); - Con_Printf ("Host_Error: %s\n", hosterrorstring1); + Con_Printf("Host_Error: %s\n", hosterrorstring1); // LordHavoc: if first frame has not been shown, or currently shutting // down, do Sys_Error instead @@ -158,16 +128,18 @@ 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(); - if (sv.active) - Host_ShutdownServer (false); + //PRVM_Crash(); // crash current prog + + // crash all prvm progs + PRVM_CrashAll(); + + PRVM_ProcessError(); + + Host_ShutdownServer (false); if (cls.state == ca_dedicated) Sys_Error ("Host_Error: %s\n",hosterrorstring2); // dedicated servers exit @@ -175,18 +147,22 @@ void Host_Error (const char *error, ...) CL_Disconnect (); cls.demonum = -1; - // unload any partially loaded models - Mod_ClearErrorModels(); - hosterror = false; longjmp (host_abortserver, 1); } +mempool_t *sv_clients_mempool = NULL; + void Host_ServerOptions (void) { int i, numplayers; + // general default + numplayers = 8; + +// COMMANDLINEOPTION: Server: -dedicated [playerlimit] starts a dedicated server (with a command console), default playerlimit is 8 +// COMMANDLINEOPTION: Server: -listen [playerlimit] starts a multiplayer server with graphical client, like singleplayer but other players can connect, default playerlimit is 8 if (cl_available) { // client exists, check what mode the user wants @@ -194,7 +170,7 @@ void Host_ServerOptions (void) if (i) { cls.state = ca_dedicated; - numplayers = 8; + // default players unless specified if (i != (com_argc - 1)) numplayers = atoi (com_argv[i+1]); if (COM_CheckParm ("-listen")) @@ -202,79 +178,64 @@ void Host_ServerOptions (void) } else { - numplayers = 1; cls.state = ca_disconnected; i = COM_CheckParm ("-listen"); if (i) { - numplayers = 8; + // default players unless specified if (i != (com_argc - 1)) numplayers = atoi (com_argv[i+1]); } + else + { + // default players in some games, singleplayer in most + if (gamemode != GAME_TRANSFUSION && gamemode != GAME_GOODVSBAD2 && gamemode != GAME_NEXUIZ && gamemode != GAME_BATTLEMECH) + numplayers = 1; + } } } else { - // no client in the executable, start dedicated server + // no client in the executable, always 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"); + // default players unless specified if (i && i != (com_argc - 1)) numplayers = atoi (com_argv[i+1]); } 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; + numplayers = bound(1, numplayers, MAX_SCOREBOARD); - if (numplayers > 1) - Cvar_SetValueQuick (&deathmatch, 1); - else - Cvar_SetValueQuick (&deathmatch, 0); + if (numplayers > 1 && !deathmatch.integer) + Cvar_SetValueQuick(&deathmatch, 1); - svs.maxclients = 0; - SV_SetMaxClients(numplayers); + svs.maxclients = numplayers; + sv_clients_mempool = Mem_AllocPool("server clients", 0, NULL); + svs.clients = Mem_Alloc(sv_clients_mempool, sizeof(client_t) * svs.maxclients); } -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)); -} - - /* ======================= 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); Cvar_RegisterVariable (&slowmo); - Cvar_RegisterVariable (&host_minfps); - Cvar_RegisterVariable (&host_maxfps); + Cvar_RegisterVariable (&cl_maxfps); Cvar_RegisterVariable (&sv_echobprint); @@ -306,12 +267,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; @@ -319,10 +280,10 @@ void Host_WriteConfiguration (void) // config.cfg cvars if (host_initialized && cls.state != ca_dedicated) { - f = FS_Open ("config.cfg", "w", false); + f = FS_Open ("config.cfg", "wb", false, false); if (!f) { - Con_Printf ("Couldn't write config.cfg.\n"); + Con_Print("Couldn't write config.cfg.\n"); return; } @@ -334,6 +295,20 @@ void Host_WriteConfiguration (void) } +/* +================= +SV_ClientPrint + +Sends text across to be displayed +FIXME: make this just a stuffed echo? +================= +*/ +void SV_ClientPrint(const char *msg) +{ + MSG_WriteByte(&host_client->message, svc_print); + MSG_WriteString(&host_client->message, msg); +} + /* ================= SV_ClientPrintf @@ -342,45 +317,60 @@ Sends text across to be displayed FIXME: make this just a stuffed echo? ================= */ -void SV_ClientPrintf (const char *fmt, ...) +void SV_ClientPrintf(const char *fmt, ...) { va_list argptr; - char string[1024]; + char msg[4096]; - va_start (argptr,fmt); - vsprintf (string, fmt,argptr); - va_end (argptr); + va_start(argptr,fmt); + dpvsnprintf(msg,sizeof(msg),fmt,argptr); + va_end(argptr); - MSG_WriteByte (&host_client->message, svc_print); - MSG_WriteString (&host_client->message, string); + SV_ClientPrint(msg); } /* ================= -SV_BroadcastPrintf +SV_BroadcastPrint Sends text to all active clients ================= */ -void SV_BroadcastPrintf (const char *fmt, ...) +void SV_BroadcastPrint(const char *msg) { - va_list argptr; - char string[1024]; int i; + client_t *client; - va_start (argptr,fmt); - vsprintf (string, fmt,argptr); - va_end (argptr); - - for (i=0 ; ispawned) { - MSG_WriteByte (&svs.clients[i].message, svc_print); - MSG_WriteString (&svs.clients[i].message, string); + MSG_WriteByte(&client->message, svc_print); + MSG_WriteString(&client->message, msg); } + } if (sv_echobprint.integer && cls.state == ca_dedicated) - Sys_Printf ("%s", string); + Con_Print(msg); +} + +/* +================= +SV_BroadcastPrintf + +Sends text to all active clients +================= +*/ +void SV_BroadcastPrintf(const char *fmt, ...) +{ + va_list argptr; + char msg[4096]; + + va_start(argptr,fmt); + dpvsnprintf(msg,sizeof(msg),fmt,argptr); + va_end(argptr); + + SV_BroadcastPrint(msg); } /* @@ -390,17 +380,17 @@ Host_ClientCommands Send text over to the client to be executed ================= */ -void Host_ClientCommands (const char *fmt, ...) +void Host_ClientCommands(const char *fmt, ...) { va_list argptr; char string[1024]; - va_start (argptr,fmt); - vsprintf (string, fmt,argptr); - va_end (argptr); + va_start(argptr,fmt); + dpvsnprintf(string, sizeof(string), fmt, argptr); + va_end(argptr); - MSG_WriteByte (&host_client->message, svc_stufftext); - MSG_WriteString (&host_client->message, string); + MSG_WriteByte(&host_client->message, svc_stufftext); + MSG_WriteString(&host_client->message, string); } /* @@ -411,73 +401,82 @@ Called when the player is getting totally kicked off the host if (crash = true), don't bother sending signofs ===================== */ -void SV_DropClient (qboolean crash) +void SV_DropClient(qboolean crash) { - int saveSelf; int i; - client_t *client; + Con_Printf("Client \"%s\" dropped\n", host_client->name); - Con_Printf ("Client \"%s\" dropped\n", host_client->name); + // make sure edict is not corrupt (from a level change for example) + host_client->edict = EDICT_NUM(host_client - svs.clients + 1); - if (!crash) + if (host_client->netconnection) { - // send any final messages (don't check for errors) - if (host_client->netconnection && !host_client->netconnection->disconnected) + // free the client (the body stays around) + if (!crash) { -#if 1 - // LordHavoc: no opportunity for resending, so reliable is silly - MSG_WriteByte (&host_client->message, svc_disconnect); - NET_SendUnreliableMessage (host_client->netconnection, &host_client->message); -#else - if (NET_CanSendMessage (host_client->netconnection)) - { - MSG_WriteByte (&host_client->message, svc_disconnect); - NET_SendMessage (host_client->netconnection, &host_client->message); - } -#endif + // LordHavoc: no opportunity for resending, so use unreliable + MSG_WriteByte(&host_client->message, svc_disconnect); + NetConn_SendUnreliableMessage(host_client->netconnection, &host_client->message); } + // break the net connection + NetConn_Close(host_client->netconnection); + host_client->netconnection = NULL; } -// break the net connection - NET_Close (host_client->netconnection); - host_client->netconnection = NULL; - -// free the client (the body stays around) - host_client->active = false; - // note: don't clear name yet - net_activeconnections--; - - 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 qc ClientDisconnect function + // LordHavoc: don't call QC if server is dead (avoids recursive + // Host_Error in some mods when they run out of edicts) + if (host_client->active && sv.active && host_client->edict && host_client->spawned) { - // 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; + // call the prog function for removing a client + // this will set the body to a dead frame, among other things + int saveSelf = pr_global_struct->self; pr_global_struct->self = EDICT_TO_PROG(host_client->edict); - PR_ExecuteProgram (pr_global_struct->ClientDisconnect, "QC function ClientDisconnect is missing"); + PR_ExecuteProgram(pr_global_struct->ClientDisconnect, "QC function ClientDisconnect is missing"); pr_global_struct->self = saveSelf; } - // now clear name (after ClientDisconnect was called) + // remove leaving player from scoreboard + //host_client->edict->v->netname = PR_SetString(host_client->name); + //if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_clientcolors))) + // val->_float = 0; + //host_client->edict->v->frags = 0; host_client->name[0] = 0; - host_client->old_frags = -999999; - + host_client->colors = 0; + host_client->frags = 0; // send notification to all clients - for (i=0, client = svs.clients ; iname); + MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors); + MSG_WriteByte (&sv.reliable_datagram, i); + MSG_WriteByte (&sv.reliable_datagram, host_client->colors); + MSG_WriteByte (&sv.reliable_datagram, svc_updatefrags); + MSG_WriteByte (&sv.reliable_datagram, i); + MSG_WriteShort (&sv.reliable_datagram, host_client->frags); + + // free the client now + if (host_client->entitydatabase) + EntityFrame_FreeDatabase(host_client->entitydatabase); + if (host_client->entitydatabase4) + EntityFrame4_FreeDatabase(host_client->entitydatabase4); + if (host_client->entitydatabase5) + EntityFrame5_FreeDatabase(host_client->entitydatabase5); + + if (sv.active) { - if (!client->active) - continue; - MSG_WriteByte (&client->message, svc_updatename); - MSG_WriteByte (&client->message, host_client - svs.clients); - MSG_WriteString (&client->message, ""); - MSG_WriteByte (&client->message, svc_updatefrags); - MSG_WriteByte (&client->message, host_client - svs.clients); - MSG_WriteShort (&client->message, 0); - MSG_WriteByte (&client->message, svc_updatecolors); - MSG_WriteByte (&client->message, host_client - svs.clients); - MSG_WriteByte (&client->message, 0); + // clear a fields that matter to DP_SV_CLIENTNAME and DP_SV_CLIENTCOLORS, and also frags + ED_ClearEdict(host_client->edict); } - NET_Heartbeat (1); + // clear the client struct (this sets active to false) + memset(host_client, 0, sizeof(*host_client)); + + // update server listing on the master because player count changed + // (which the master uses for filtering empty/full servers) + NetConn_Heartbeat(1); } /* @@ -492,7 +491,8 @@ void Host_ShutdownServer(qboolean crash) int i, count; sizebuf_t buf; char message[4]; - double start; + + Con_DPrintf("Host_ShutdownServer\n"); if (!sv.active) return; @@ -500,58 +500,31 @@ void Host_ShutdownServer(qboolean crash) // print out where the crash happened, if it was caused by QC PR_Crash(); - sv.active = false; - -// stop all client sounds immediately - CL_Disconnect (); - - NET_Heartbeat (2); - NET_Heartbeat (2); - -// flush any pending messages - like the score!!! - start = Sys_DoubleTime(); - do - { - count = 0; - for (i=0, host_client = svs.clients ; iactive && host_client->message.cursize) - { - if (NET_CanSendMessage (host_client->netconnection)) - { - NET_SendMessage(host_client->netconnection, &host_client->message); - SZ_Clear (&host_client->message); - } - else - { - NET_GetMessage(host_client->netconnection); - count++; - } - } - } - if ((Sys_DoubleTime() - start) > 3.0) - break; - } - while (count); + NetConn_Heartbeat(2); + NetConn_Heartbeat(2); // make sure all the clients know we're disconnecting buf.data = message; buf.maxsize = 4; buf.cursize = 0; MSG_WriteByte(&buf, svc_disconnect); - count = NET_SendToAll(&buf, 5); + count = NetConn_SendToAll(&buf, 5); if (count) - Con_Printf("Host_ShutdownServer: NET_SendToAll failed for %u clients\n", count); + Con_Printf("Host_ShutdownServer: NetConn_SendToAll failed for %u clients\n", count); - for (i=0, host_client = svs.clients ; iactive) SV_DropClient(crash); // server shutdown + NetConn_CloseServerPorts(); + + sv.active = false; + // // clear structures // - memset (&sv, 0, sizeof(sv)); - memset (svs.clients, 0, svs.maxclients * sizeof(client_t)); + memset(&sv, 0, sizeof(sv)); + memset(svs.clients, 0, svs.maxclients*sizeof(client_t)); } @@ -565,7 +538,7 @@ not reinitialize anything. */ void Host_ClearMemory (void) { - Con_DPrintf ("Clearing memory\n"); + Con_DPrint("Clearing memory\n"); Mod_ClearAll (); cls.signon = 0; @@ -583,62 +556,83 @@ Host_FilterTime Returns false if the time is too short to run a frame =================== */ -extern cvar_t cl_avidemo; +extern qboolean cl_capturevideo_active; +extern double cl_capturevideo_framerate; qboolean Host_FilterTime (double time) { - double timecap; + double timecap, timeleft; realtime += time; - 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); + if (sys_ticrate.value < 0.00999 || sys_ticrate.value > 0.10001) + Cvar_SetValue("sys_ticrate", bound(0.01, sys_ticrate.value, 0.1)); + if (slowmo.value < 0) + Cvar_SetValue("slowmo", 0); + if (host_framerate.value < 0.00001 && host_framerate.value != 0) + Cvar_SetValue("host_framerate", 0); + if (cl_maxfps.value < 1) + Cvar_SetValue("cl_maxfps", 1); - // 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; + // disable time effects during timedemo + cl.frametime = host_realframetime = host_frametime = realtime - oldrealtime; + oldrealtime = realtime; + return true; } - 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 + + // check if framerate is too high + // default to sys_ticrate (server framerate - presumably low) unless we + // have a good reason to run faster + timecap = host_framerate.value; + if (!timecap) timecap = sys_ticrate.value; - if (vid_activewindow && (cls.state == ca_connected || cl_videoplaying)) - timecap = 1.0 / host_maxfps.value; + if (cls.state != ca_dedicated) + { + if (cl_capturevideo_active) + timecap = 1.0 / cl_capturevideo_framerate; + else if (vid_activewindow) + timecap = 1.0 / cl_maxfps.value; + } - if ((realtime - oldrealtime) < timecap) - return false; + timeleft = (oldrealtime - realtime) + timecap; + if (timeleft > 0) + { + int msleft; + // don't totally hog the CPU + if (cls.state == ca_dedicated) + { + // if dedicated, try to use as little cpu as possible by waiting + // just a little longer than necessary + // (yes this means it doesn't quite keep up with the framerate) + msleft = (int)ceil(timeleft * 1000); + } + else + { + // if not dedicated, try to hit exactly a steady framerate by not + // sleeping the full amount + msleft = (int)floor(timeleft * 1000); + } + if (msleft > 0) + Sys_Sleep(msleft); + return false; } // 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; - } + // apply slowmo scaling + host_frametime *= slowmo.value; - if (host_framerate.value > 0) + // host_framerate overrides all else + if (host_framerate.value) 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 - 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 + // never run a frame longer than 1 second + if (host_frametime > 1) + host_frametime = 1; + + cl.frametime = host_frametime; return true; } @@ -673,38 +667,60 @@ Host_ServerFrame */ void Host_ServerFrame (void) { - static double frametimetotal = 0, lastservertime = 0; - frametimetotal += host_frametime; - // LordHavoc: cap server at sys_ticrate in listen games - if (cls.state != ca_dedicated && svs.maxclients > 1 && ((realtime - lastservertime) < sys_ticrate.value)) + // never run more than 5 frames at a time as a sanity limit + int framecount, framelimit = 5; + double advancetime, newtime; + if (!sv.active) return; -// run the world state - 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; + newtime = Sys_DoubleTime(); + // if this is the first frame of a new server, ignore the huge time difference + if (!sv.timer) + sv.timer = newtime; + // if we're already past the new time, don't run a frame + // (does not happen if cl.islocalgame) + if (sv.timer > newtime) + return; + // run the world state + // don't allow simulation to run too fast or too slow or logic glitches can occur + for (framecount = 0;framecount < framelimit && sv.timer < newtime;framecount++) + { + if (cl.islocalgame) + advancetime = min(newtime - sv.timer, sys_ticrate.value); + else + advancetime = sys_ticrate.value; + sv.timer += advancetime; -// set the time and clear the general datagram - SV_ClearDatagram (); + // only advance time if not paused + // the game also pauses in singleplayer when menu or console is used + sv.frametime = advancetime * slowmo.value; + if (sv.paused || (cl.islocalgame && (key_dest != key_game || key_consoleactive))) + sv.frametime = 0; -// check for new clients - SV_CheckForNewClients (); + pr_global_struct->frametime = sv.frametime; -// read client messages - SV_RunClients (); + // set the time and clear the general datagram + SV_ClearDatagram(); -// move things around and think -// always pause in single player if in console or menus - if (sv.frametime) - SV_Physics (); + // check for network packets to the server each world step incase they + // come in midframe (particularly if host is running really slow) + NetConn_ServerFrame(); -// send all messages to the clients - SV_SendClientMessages (); + // read client messages + SV_RunClients(); -// send an heartbeat if enough time has passed since the last one - NET_Heartbeat (0); + // move things around and think unless paused + 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 + NetConn_Heartbeat(0); + } + // if we fell behind too many frames just don't worry about it + if (sv.timer < newtime) + sv.timer = newtime; } @@ -722,37 +738,33 @@ void _Host_Frame (float time) static double time3 = 0; int pass1, pass2, pass3; - if (setjmp (host_abortserver) ) + 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)) - { - // if time was rejected, don't totally hog the CPU - Sys_Sleep(); + // decide the simulation time + if (!Host_FilterTime(time)) return; - } -// get new key events - Sys_SendKeyEvents (); + // keep the random time dependent + rand(); -// allow mice or other external controllers to add commands - IN_Commands (); + cl.islocalgame = NetConn_IsLocalGame(); -// process console commands - Cbuf_Execute (); + // get new key events + Sys_SendKeyEvents(); - // LordHavoc: map and load are delayed until video is initialized - Host_PerformSpawnServerAndLoadGame(); + // allow mice or other external controllers to add commands + IN_Commands(); - NET_Poll(); + // Collect input into cmd + IN_ProcessMove(); -// if running the server locally, make intentions now - if (sv.active) - CL_SendCmd (); + // process console commands + Cbuf_Execute(); + + // if running the server locally, make intentions now + if (cls.state == ca_connected && sv.active) + CL_SendCmd(); //------------------- // @@ -760,11 +772,11 @@ void _Host_Frame (float time) // //------------------- -// check for commands typed to the host - Host_GetConsoleCommands (); + // check for commands typed to the host + Host_GetConsoleCommands(); if (sv.active) - Host_ServerFrame (); + Host_ServerFrame(); //------------------- // @@ -772,53 +784,57 @@ 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.oldtime = cl.time; + cl.time += cl.frametime; + + NetConn_ClientFrame(); -// fetch results from server if (cls.state == ca_connected) - CL_ReadFromServer (); + { + // if running the server remotely, send intentions now after + // the incoming messages have been read + if (!sv.active) + CL_SendCmd(); + CL_ReadFromServer(); + } - ui_update(); + //ui_update(); CL_VideoFrame(); -// update video + // update video if (host_speeds.integer) - time1 = Sys_DoubleTime (); + time1 = Sys_DoubleTime(); - CL_UpdateScreen (); + CL_UpdateScreen(); if (host_speeds.integer) - time2 = Sys_DoubleTime (); + time2 = Sys_DoubleTime(); -// update audio - if (cls.signon == SIGNONS) + // update audio + 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); + S_Update(&cl_entities[cl.viewentity].render.matrix); } else - S_Update (vec3_origin, vec3_origin, vec3_origin, vec3_origin); + S_Update(&identitymatrix); CDAudio_Update(); if (host_speeds.integer) { pass1 = (time1 - time3)*1000000; - time3 = Sys_DoubleTime (); + time3 = Sys_DoubleTime(); pass2 = (time2 - time1)*1000000; pass3 = (time3 - time2)*1000000; - Con_Printf ("%6ius total %6ius server %6ius gfx %6ius snd\n", + 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) @@ -854,7 +870,7 @@ void Host_Frame (float time) c++; } - Con_Printf ("serverprofile: %2i clients %2i msec\n", c, m); + Con_Printf("serverprofile: %2i clients %2i msec\n", c, m); } //============================================================================ @@ -868,10 +884,13 @@ Host_Init */ void Host_Init (void) { + int i; + // LordHavoc: quake never seeded the random number generator before... heh srand(time(NULL)); // 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; @@ -879,49 +898,106 @@ void Host_Init (void) developer.value = 1; } - Cmd_Init (); + Cmd_Init(); Memory_Init_Commands(); R_Modules_Init(); - Cbuf_Init (); - V_Init (); - COM_Init (); - Host_InitLocal (); - W_LoadWadFile ("gfx.wad"); - Key_Init (); - Con_Init (); - Chase_Init (); - M_Init (); - PR_Init (); - Mod_Init (); - NET_Init (); - SV_Init (); - - Con_Printf ("Builddate: %s\n", buildstring); + Cbuf_Init(); + V_Init(); + COM_Init(); + Host_InitLocal(); + Key_Init(); + Con_Init(); + PR_Init(); + PRVM_Init(); + Mod_Init(); + NetConn_Init(); + SV_Init(); + + Con_Printf("Builddate: %s\n", buildstring); if (cls.state != ca_dedicated) { Palette_Init(); + MR_Init_Commands(); VID_Shared_Init(); VID_Init(); Render_Init(); - S_Init (); - CDAudio_Init (); - CL_Init (); + S_Init(); + CDAudio_Init(); + CL_Init(); } - Cbuf_InsertText ("exec quake.rc\n"); - Cbuf_Execute (); - Cbuf_Execute (); - Cbuf_Execute (); - Cbuf_Execute (); + // only cvars are executed when host_initialized == false + if (gamemode == GAME_TEU) + Cbuf_InsertText("exec teu.rc\n"); + else + Cbuf_InsertText("exec quake.rc\n"); + Cbuf_Execute(); host_initialized = true; - Con_Printf ("========Quake Initialized=========\n"); + Con_DPrint("========Initialized=========\n"); if (cls.state != ca_dedicated) + { VID_Open(); + CDAudio_Startup(); + CL_InitTEnts (); // We must wait after sound startup to load tent sounds + SCR_BeginLoadingPlaque(); + MR_Init(); + } + + // set up the default startmap_sp and startmap_dm aliases, mods can + // override these + if (gamemode == GAME_NEHAHRA) + { + Cbuf_InsertText ("alias startmap_sp \"map nehstart\"\n"); + Cbuf_InsertText ("alias startmap_dm \"map nehstart\"\n"); + } + else if (gamemode == GAME_TRANSFUSION) + { + Cbuf_InsertText ("alias startmap_sp \"map e1m1\"\n"); + Cbuf_InsertText ("alias startmap_dm \"map bb1\"\n"); + } + else if (gamemode == GAME_NEXUIZ) + { + Cbuf_InsertText ("alias startmap_sp \"map nexdm01\"\n"); + Cbuf_InsertText ("alias startmap_dm \"map nexdm01\"\n"); + } + else + { + Cbuf_InsertText ("alias startmap_sp \"map start\"\n"); + Cbuf_InsertText ("alias startmap_dm \"map start\"\n"); + } + + // stuff it again so the first host frame will execute it again, this time + // in its entirety + if (gamemode == GAME_TEU) + Cbuf_InsertText("exec teu.rc\n"); + else + Cbuf_InsertText("exec quake.rc\n"); + + Cbuf_Execute(); + Cbuf_Execute(); + Cbuf_Execute(); + + if (!sv.active && (cls.state == ca_dedicated || COM_CheckParm("-listen"))) + Cbuf_InsertText ("startmap_dm\n"); + + // check for special benchmark mode +// COMMANDLINEOPTION: Client: -benchmark runs a timedemo and quits, results of any timedemo can be found in gamedir/benchmark.log (for example id1/benchmark.log) + i = COM_CheckParm("-benchmark"); + if (i && i + 1 < com_argc && !sv.active) + Cbuf_InsertText(va("timedemo %s\n", com_argv[i + 1])); + + if (!sv.active && !cls.demoplayback && !cls.connect_trying) + Cbuf_InsertText("togglemenu\n"); + + Cbuf_Execute(); + + // We must wait for the log_file cvar to be initialized to start the log + Log_Start (); } @@ -939,21 +1015,45 @@ void Host_Shutdown(void) if (isdown) { - Con_Printf ("recursive shutdown\n"); + Con_Print("recursive shutdown\n"); return; } isdown = true; - Host_WriteConfiguration (); + // disconnect client from server if active + CL_Disconnect(); + + // shut down local server if active + Host_ShutdownServer (false); + + // Shutdown menu + if(MR_Shutdown) + MR_Shutdown(); + + // AK shutdown PRVM + // AK hmm, no PRVM_Shutdown(); yet + + CL_Video_Shutdown(); + + Host_SaveConfig_f(); CDAudio_Shutdown (); - NET_Shutdown (); - S_Shutdown(); + S_Terminate (); + NetConn_Shutdown (); + PR_Shutdown (); + Cbuf_Shutdown (); if (cls.state != ca_dedicated) { R_Modules_Shutdown(); VID_Shutdown(); } + + Cmd_Shutdown(); + CL_Shutdown(); + Sys_Shutdown(); + Log_Close (); + COM_Shutdown (); + Memory_Shutdown(); }