X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=host.c;h=7233970b719aaa728dcc2493a4f23c36fcb702f1;hb=322c9a90b31ede335eabe8c2f52030b3f41db9ad;hp=7b6cd76ef06ba4efe97b3e4e8af10f945040b329;hpb=bf87ef12e4419b568e57fc19f2f547b199b4f5aa;p=xonotic%2Fdarkplaces.git diff --git a/host.c b/host.c index 7b6cd76e..7233970b 100644 --- a/host.c +++ b/host.c @@ -34,65 +34,80 @@ Memory is cleared / released when a server or client begins, not when they end. */ -qboolean host_initialized; // true if into command execution -qboolean host_loopactive = false; // LordHavoc: used to turn Host_Error into Sys_Error if starting up or shutting down -qboolean host_shuttingdown = false; // LordHavoc: set when quit is executed +// 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; -double host_frametime; -double host_realframetime; // LordHavoc: the real frametime, before slowmo and clamping are applied (used for console scrolling) -double realtime; // without any filtering or bounding -double oldrealtime; // last frame run -int host_framecount; +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; -int forcedeveloper; // used for -developer commandline parameter, hacky hacky +// used for -developer commandline parameter, hacky hacky +int forcedeveloper; -client_t *host_client; // current client +// current client +client_t *host_client; -jmp_buf host_abortserver; +jmp_buf host_abortserver; -cvar_t host_framerate = {0, "host_framerate","0"}; // set for slow motion -cvar_t host_speeds = {0, "host_speeds","0"}; // set for running times -cvar_t slowmo = {0, "slowmo", "1.0"}; // LordHavoc: framerate independent slowmo -cvar_t host_minfps = {CVAR_SAVE, "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 = {CVAR_SAVE, "host_maxfps", "1000"}; // LordHavoc: framerate upper cap +// 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"}; -cvar_t sv_echobprint = {CVAR_SAVE, "sv_echobprint", "1"}; // print broadcast messages in dedicated mode +// print broadcast messages in dedicated mode +cvar_t sv_echobprint = {CVAR_SAVE, "sv_echobprint", "1"}; -cvar_t sys_ticrate = {CVAR_SAVE, "sys_ticrate","0.05"}; -cvar_t serverprofile = {0, "serverprofile","0"}; +cvar_t sys_ticrate = {CVAR_SAVE, "sys_ticrate","0.05"}; +cvar_t serverprofile = {0, "serverprofile","0"}; -cvar_t fraglimit = {CVAR_NOTIFY, "fraglimit","0"}; -cvar_t timelimit = {CVAR_NOTIFY, "timelimit","0"}; -cvar_t teamplay = {CVAR_NOTIFY, "teamplay","0"}; +cvar_t fraglimit = {CVAR_NOTIFY, "fraglimit","0"}; +cvar_t timelimit = {CVAR_NOTIFY, "timelimit","0"}; +cvar_t teamplay = {CVAR_NOTIFY, "teamplay","0"}; -cvar_t samelevel = {0, "samelevel","0"}; -cvar_t noexit = {CVAR_NOTIFY, "noexit","0"}; +cvar_t samelevel = {0, "samelevel","0"}; +cvar_t noexit = {CVAR_NOTIFY, "noexit","0"}; -cvar_t developer = {0, "developer","0"}; +cvar_t developer = {0, "developer","0"}; -cvar_t skill = {0, "skill","1"}; // 0 - 3 -cvar_t deathmatch = {0, "deathmatch","0"}; // 0, 1, or 2 -cvar_t coop = {0, "coop","0"}; // 0 or 1 +cvar_t skill = {0, "skill","1"}; +cvar_t deathmatch = {0, "deathmatch","0"}; +cvar_t coop = {0, "coop","0"}; -cvar_t pausable = {0, "pausable","1"}; +cvar_t pausable = {0, "pausable","1"}; -cvar_t temp1 = {0, "temp1","0"}; +cvar_t temp1 = {0, "temp1","0"}; -cvar_t timestamps = {CVAR_SAVE, "timestamps", "0"}; -cvar_t timeformat = {CVAR_SAVE, "timeformat", "[%b %e %X] "}; +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_list argptr; + char string[1024]; - va_start (argptr,message); - vsprintf (string,message,argptr); + va_start (argptr,format); + vsprintf (string,format,argptr); va_end (argptr); Con_DPrintf ("Host_EndGame: %s\n",string); @@ -118,10 +133,10 @@ This shuts down both the client and server ================ */ char hosterrorstring[4096]; -void Host_Error (char *error, ...) +void Host_Error (const char *error, ...) { - va_list argptr; - 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 @@ -169,26 +184,42 @@ void Host_ServerOptions (void) { int i, numplayers; - numplayers = 1; - - i = COM_CheckParm ("-dedicated"); - if (i) + if (cl_available) { - cls.state = ca_dedicated; - numplayers = 0; - if (i != (com_argc - 1)) - numplayers = atoi (com_argv[i+1]); + // client exists, check what mode the user wants + i = COM_CheckParm ("-dedicated"); + if (i) + { + 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 + { + 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"); - numplayers = 0; - if (i != (com_argc - 1)) + // 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]); } @@ -279,7 +310,7 @@ Writes key bindings and archived cvars to config.cfg */ void Host_WriteConfiguration (void) { - QFile *f; + QFile *f; // dedicated servers initialize the host but don't parse and set the // config.cfg cvars @@ -291,7 +322,7 @@ void Host_WriteConfiguration (void) Con_Printf ("Couldn't write config.cfg.\n"); return; } - + Key_WriteBindings (f); Cvar_WriteVariables (f); @@ -308,15 +339,15 @@ 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); } @@ -328,16 +359,16 @@ 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_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 @@ -430,6 +461,8 @@ void SV_DropClient (qboolean crash) MSG_WriteByte (&client->message, host_client - svs.clients); MSG_WriteByte (&client->message, 0); } + + NET_Heartbeat (1); } /* @@ -441,11 +474,10 @@ 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; @@ -458,6 +490,9 @@ void Host_ShutdownServer(qboolean crash) // stop all client sounds immediately CL_Disconnect (); + NET_Heartbeat (2); + NET_Heartbeat (2); + // flush any pending messages - like the score!!! start = Sys_DoubleTime(); do @@ -603,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) { @@ -652,6 +687,9 @@ void Host_ServerFrame (void) // send all messages to the clients SV_SendClientMessages (); + +// send an heartbeat if enough time has passed since the last one + NET_Heartbeat (0); } @@ -664,10 +702,10 @@ 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 @@ -692,6 +730,9 @@ 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 @@ -767,10 +808,10 @@ void _Host_Frame (float time) 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.integer) { @@ -846,32 +887,29 @@ void Host_Init (void) if (cls.state != ca_dedicated) { - VID_InitCvars(); - Gamma_Init(); - Palette_Init(); - -#ifndef _WIN32 // on non win32, mouse comes before video for security reasons - IN_Init (); -#endif - VID_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"); + 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(); } @@ -899,7 +937,6 @@ void Host_Shutdown(void) CDAudio_Shutdown (); NET_Shutdown (); S_Shutdown(); - IN_Shutdown (); if (cls.state != ca_dedicated) {