X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=host.c;h=af9a7b806295f5017e0bca2599862d65e1fcbb1e;hb=7faa0dba4d1f633b5cadf53ce734ed3776bc4d01;hp=4f3e0e45b2e46becd534d25ef4a46ea9de937152;hpb=14c48c87b9d0e34b8e7b7544f9561372fc967054;p=xonotic%2Fdarkplaces.git diff --git a/host.c b/host.c index 4f3e0e45..af9a7b80 100644 --- a/host.c +++ b/host.c @@ -47,24 +47,24 @@ Memory is cleared / released when a server or client begins, not when they end. host_t host; // pretend frames take this amount of time (in seconds), 0 = realtime -cvar_t host_framerate = {CVAR_CLIENT | CVAR_SERVER, "host_framerate","0", "locks frame timing to this value in seconds, 0.05 is 20fps for example, note that this can easily run too fast, use cl_maxfps if you want to limit your framerate instead, or sys_ticrate to limit server speed"}; -cvar_t cl_maxphysicsframesperserverframe = {CVAR_CLIENT, "cl_maxphysicsframesperserverframe","10", "maximum number of physics frames per server frame"}; +cvar_t host_framerate = {CF_CLIENT | CF_SERVER, "host_framerate","0", "locks frame timing to this value in seconds, 0.05 is 20fps for example, note that this can easily run too fast, use cl_maxfps if you want to limit your framerate instead, or sys_ticrate to limit server speed"}; +cvar_t cl_maxphysicsframesperserverframe = {CF_CLIENT, "cl_maxphysicsframesperserverframe","10", "maximum number of physics frames per server frame"}; // shows time used by certain subsystems -cvar_t host_speeds = {CVAR_CLIENT | CVAR_SERVER, "host_speeds","0", "reports how much time is used in server/graphics/sound"}; -cvar_t host_maxwait = {CVAR_CLIENT | CVAR_SERVER, "host_maxwait","1000", "maximum sleep time requested from the operating system in millisecond. Larger sleeps will be done using multiple host_maxwait length sleeps. Lowering this value will increase CPU load, but may help working around problems with accuracy of sleep times."}; +cvar_t host_speeds = {CF_CLIENT | CF_SERVER, "host_speeds","0", "reports how much time is used in server/graphics/sound"}; +cvar_t host_maxwait = {CF_CLIENT | CF_SERVER, "host_maxwait","1000", "maximum sleep time requested from the operating system in millisecond. Larger sleeps will be done using multiple host_maxwait length sleeps. Lowering this value will increase CPU load, but may help working around problems with accuracy of sleep times."}; -cvar_t developer = {CVAR_CLIENT | CVAR_SERVER | CVAR_SAVE, "developer","0", "shows debugging messages and information (recommended for all developers and level designers); the value -1 also suppresses buffering and logging these messages"}; -cvar_t developer_extra = {CVAR_CLIENT | CVAR_SERVER, "developer_extra", "0", "prints additional debugging messages, often very verbose!"}; -cvar_t developer_insane = {CVAR_CLIENT | CVAR_SERVER, "developer_insane", "0", "prints huge streams of information about internal workings, entire contents of files being read/written, etc. Not recommended!"}; -cvar_t developer_loadfile = {CVAR_CLIENT | CVAR_SERVER, "developer_loadfile","0", "prints name and size of every file loaded via the FS_LoadFile function (which is almost everything)"}; -cvar_t developer_loading = {CVAR_CLIENT | CVAR_SERVER, "developer_loading","0", "prints information about files as they are loaded or unloaded successfully"}; -cvar_t developer_entityparsing = {CVAR_CLIENT, "developer_entityparsing", "0", "prints detailed network entities information each time a packet is received"}; +cvar_t developer = {CF_CLIENT | CF_SERVER | CF_ARCHIVE, "developer","0", "shows debugging messages and information (recommended for all developers and level designers); the value -1 also suppresses buffering and logging these messages"}; +cvar_t developer_extra = {CF_CLIENT | CF_SERVER, "developer_extra", "0", "prints additional debugging messages, often very verbose!"}; +cvar_t developer_insane = {CF_CLIENT | CF_SERVER, "developer_insane", "0", "prints huge streams of information about internal workings, entire contents of files being read/written, etc. Not recommended!"}; +cvar_t developer_loadfile = {CF_CLIENT | CF_SERVER, "developer_loadfile","0", "prints name and size of every file loaded via the FS_LoadFile function (which is almost everything)"}; +cvar_t developer_loading = {CF_CLIENT | CF_SERVER, "developer_loading","0", "prints information about files as they are loaded or unloaded successfully"}; +cvar_t developer_entityparsing = {CF_CLIENT, "developer_entityparsing", "0", "prints detailed network entities information each time a packet is received"}; -cvar_t timestamps = {CVAR_CLIENT | CVAR_SERVER | CVAR_SAVE, "timestamps", "0", "prints timestamps on console messages"}; -cvar_t timeformat = {CVAR_CLIENT | CVAR_SERVER | CVAR_SAVE, "timeformat", "[%Y-%m-%d %H:%M:%S] ", "time format to use on timestamped console messages"}; +cvar_t timestamps = {CF_CLIENT | CF_SERVER | CF_ARCHIVE, "timestamps", "0", "prints timestamps on console messages"}; +cvar_t timeformat = {CF_CLIENT | CF_SERVER | CF_ARCHIVE, "timeformat", "[%Y-%m-%d %H:%M:%S] ", "time format to use on timestamped console messages"}; -cvar_t sessionid = {CVAR_CLIENT | CVAR_SERVER | CVAR_READONLY, "sessionid", "", "ID of the current session (use the -sessionid parameter to set it); this is always either empty or begins with a dot (.)"}; -cvar_t locksession = {CVAR_CLIENT | CVAR_SERVER, "locksession", "0", "Lock the session? 0 = no, 1 = yes and abort on failure, 2 = yes and continue on failure"}; +cvar_t sessionid = {CF_CLIENT | CF_SERVER | CF_READONLY, "sessionid", "", "ID of the current session (use the -sessionid parameter to set it); this is always either empty or begins with a dot (.)"}; +cvar_t locksession = {CF_CLIENT | CF_SERVER, "locksession", "0", "Lock the session? 0 = no, 1 = yes and abort on failure, 2 = yes and continue on failure"}; /* ================ @@ -93,7 +93,7 @@ void Host_Error (const char *error, ...) { static char hosterrorstring1[MAX_INPUTLINE]; // THREAD UNSAFE static char hosterrorstring2[MAX_INPUTLINE]; // THREAD UNSAFE - static qboolean hosterror = false; + static qbool hosterror = false; va_list argptr; // turn off rcon redirect if it was active when the crash occurred @@ -160,14 +160,14 @@ static void Host_ServerOptions (void) // COMMANDLINEOPTION: Server: -listen [playerlimit] starts a multiplayer server with graphical client, like singleplayer but other players can connect, default playerlimit is 8 // if no client is in the executable or -dedicated is specified on // commandline, start a dedicated server - i = COM_CheckParm ("-dedicated"); + i = Sys_CheckParm ("-dedicated"); if (i || !cl_available) { cls.state = ca_dedicated; // check for -dedicated specifying how many players if (i && i + 1 < sys.argc && atoi (sys.argv[i+1]) >= 1) svs.maxclients = atoi (sys.argv[i+1]); - if (COM_CheckParm ("-listen")) + if (Sys_CheckParm ("-listen")) Con_Printf ("Only one of -dedicated or -listen can be specified\n"); // default sv_public on for dedicated servers (often hosted by serious administrators), off for listen servers (often hosted by clueless users) Cvar_SetValue(&cvars_all, "sv_public", 1); @@ -176,7 +176,7 @@ static void Host_ServerOptions (void) { // client exists and not dedicated, check if -listen is specified cls.state = ca_disconnected; - i = COM_CheckParm ("-listen"); + i = Sys_CheckParm ("-listen"); if (i) { // default players unless specified @@ -234,10 +234,10 @@ extern cvar_t sv_writepicture_quality; extern cvar_t r_texture_jpeg_fastpicmip; static void Host_InitLocal (void) { - Cmd_AddCommand(CMD_SHARED, "quit", Host_Quit_f, "quit the game"); - Cmd_AddCommand(CMD_SHARED, "version", Host_Version_f, "print engine version"); - Cmd_AddCommand(CMD_SHARED, "saveconfig", Host_SaveConfig_f, "save settings to config.cfg (or a specified filename) immediately (also automatic when quitting)"); - Cmd_AddCommand(CMD_SHARED, "loadconfig", Host_LoadConfig_f, "reset everything and reload configs"); + Cmd_AddCommand(CF_SHARED, "quit", Host_Quit_f, "quit the game"); + Cmd_AddCommand(CF_SHARED, "version", Host_Version_f, "print engine version"); + Cmd_AddCommand(CF_SHARED, "saveconfig", Host_SaveConfig_f, "save settings to config.cfg (or a specified filename) immediately (also automatic when quitting)"); + Cmd_AddCommand(CF_SHARED, "loadconfig", Host_LoadConfig_f, "reset everything and reload configs"); Cvar_RegisterVariable (&cl_maxphysicsframesperserverframe); Cvar_RegisterVariable (&host_framerate); Cvar_RegisterCallback (&host_framerate, Host_Framerate_c); @@ -273,7 +273,7 @@ static void Host_SaveConfig_to(const char *file) // dedicated servers initialize the host but don't parse and set the // config.cfg cvars // LadyHavoc: don't save a config if it crashed in startup - if (host.framecount >= 3 && cls.state != ca_dedicated && !COM_CheckParm("-benchmark") && !COM_CheckParm("-capturedemo")) + if (host.framecount >= 3 && cls.state != ca_dedicated && !Sys_CheckParm("-benchmark") && !Sys_CheckParm("-capturedemo")) { f = FS_OpenRealFile(file, "wb", false); if (!f) @@ -316,7 +316,7 @@ static void Host_AddConfigText(cmd_state_t *cmd) Cbuf_InsertText(cmd, "alias startmap_sp \"map start\"\nalias startmap_dm \"map start\"\nexec teu.rc\n"); else Cbuf_InsertText(cmd, "alias startmap_sp \"map start\"\nalias startmap_dm \"map start\"\nexec " STARTCONFIGFILENAME "\n"); - Cbuf_Execute(cmd); + Cbuf_Execute(cmd->cbuf); } /* @@ -403,11 +403,8 @@ double Host_Frame(double time) // process console commands // R_TimeReport("preconsole"); - Cbuf_Frame(&cmd_client); - Cbuf_Frame(&cmd_server); - if(sv.active) - Cbuf_Frame(&cmd_serverfromclient); + Cbuf_Frame(host.cbuf); // R_TimeReport("console"); @@ -436,7 +433,8 @@ double Host_Frame(double time) static inline void Host_Sleep(double time) { - double time0, delta; + static double delta; + double time0; if(host_maxwait.value <= 0) time = min(time, 1000000.0); @@ -471,12 +469,12 @@ static inline double Host_UpdateTime (double newtime, double oldtime) { // warn if it's significant if (time < -0.01) - Con_Printf(CON_WARN "Host_GetTime: time stepped backwards (went from %f to %f, difference %f)\n", oldtime, newtime, time); + Con_Printf(CON_WARN "Host_UpdateTime: time stepped backwards (went from %f to %f, difference %f)\n", oldtime, newtime, time); time = 0; } else if (time >= 1800) { - Con_Printf(CON_WARN "Host_GetTime: time stepped forward (went from %f to %f, difference %f)\n", oldtime, newtime, time); + Con_Printf(CON_WARN "Host_UpdateTime: time stepped forward (went from %f to %f, difference %f)\n", oldtime, newtime, time); time = 0; } @@ -522,14 +520,16 @@ void Host_Main(void) //============================================================================ -qboolean vid_opened = false; +qbool vid_opened = false; void Host_StartVideo(void) { if (!vid_opened && cls.state != ca_dedicated) { vid_opened = true; +#ifdef WIN32 // make sure we open sockets before opening video because the Windows Firewall "unblock?" dialog can screw up the graphics context on some graphics drivers NetConn_UpdateSockets(); +#endif VID_Start(); CDAudio_Startup(); } @@ -537,10 +537,10 @@ void Host_StartVideo(void) char engineversion[128]; -qboolean sys_nostdout = false; +qbool sys_nostdout = false; static qfile_t *locksession_fh = NULL; -static qboolean locksession_run = false; +static qbool locksession_run = false; static void Host_InitSession(void) { int i; @@ -549,7 +549,7 @@ static void Host_InitSession(void) Cvar_RegisterVariable(&locksession); // load the session ID into the read-only cvar - if ((i = COM_CheckParm("-sessionid")) && (i + 1 < sys.argc)) + if ((i = Sys_CheckParm("-sessionid")) && (i + 1 < sys.argc)) { if(sys.argv[i+1][0] == '.') Cvar_SetQuick(&sessionid, sys.argv[i+1]); @@ -566,7 +566,7 @@ void Host_LockSession(void) if(locksession_run) return; locksession_run = true; - if(locksession.integer != 0 && !COM_CheckParm("-readonly")) + if(locksession.integer != 0 && !Sys_CheckParm("-readonly")) { char vabuf[1024]; char *p = va(vabuf, sizeof(vabuf), "%slock%s", *fs_userdir ? fs_userdir : fs_basedir, sessionid.string); @@ -616,11 +616,14 @@ static void Host_Init (void) host.state = host_init; - if (COM_CheckParm("-profilegameonly")) + if (setjmp(host.abortframe)) // Huh?! + Sys_Error("Engine initialization failed. Check the console (if available) for additional information.\n"); + + if (Sys_CheckParm("-profilegameonly")) Sys_AllowProfiling(false); // LadyHavoc: quake never seeded the random number generator before... heh - if (COM_CheckParm("-benchmark")) + if (Sys_CheckParm("-benchmark")) srand(0); // predictable random sequence for -benchmark else srand((unsigned int)time(NULL)); @@ -629,13 +632,13 @@ static void Host_Init (void) // LadyHavoc: doesn't seem very temporary... // LadyHavoc: made this a saved cvar // COMMANDLINEOPTION: Console: -developer enables warnings and other notices (RECOMMENDED for mod developers) - if (COM_CheckParm("-developer")) + if (Sys_CheckParm("-developer")) { developer.value = developer.integer = 1; developer.string = "1"; } - if (COM_CheckParm("-developer2") || COM_CheckParm("-developer3")) + if (Sys_CheckParm("-developer2") || Sys_CheckParm("-developer3")) { developer.value = developer.integer = 1; developer.string = "1"; @@ -649,19 +652,16 @@ static void Host_Init (void) developer_memorydebug.string = "1"; } - if (COM_CheckParm("-developer3")) + if (Sys_CheckParm("-developer3")) { gl_paranoid.integer = 1;gl_paranoid.string = "1"; gl_printcheckerror.integer = 1;gl_printcheckerror.string = "1"; } // COMMANDLINEOPTION: Console: -nostdout disables text output to the terminal the game was launched from - if (COM_CheckParm("-nostdout")) + if (Sys_CheckParm("-nostdout")) sys_nostdout = 1; - // used by everything - Memory_Init(); - // initialize console command/cvar/alias/command execution systems Cmd_Init(); @@ -704,7 +704,6 @@ static void Host_Init (void) Mod_Init(); World_Init(); SV_Init(); - V_Init(); // some cvars needed by server player physics (cl_rollangle etc) Host_InitLocal(); Host_ServerOptions(); @@ -721,68 +720,64 @@ static void Host_Init (void) // without crashing the whole game, so this should just be a short-time solution // here comes the not so critical stuff - if (setjmp(host.abortframe)) { - return; - } Host_AddConfigText(cmd); - Host_StartVideo(); - // if quake.rc is missing, use default if (!FS_FileExists("quake.rc")) { - Cbuf_InsertText(cmd, "exec default.cfg\nexec " CONFIGFILENAME "\nexec autoexec.cfg\n"); - Cbuf_Execute(cmd); + Cbuf_AddText(cmd, "exec default.cfg\nexec " CONFIGFILENAME "\nexec autoexec.cfg\n"); + Cbuf_Execute(cmd->cbuf); } host.state = host_active; - // run stuffcmds now, deferred previously because it can crash if a server starts that early - Cbuf_AddText(cmd,"stuffcmds\n"); - Cbuf_Execute(cmd); + Host_StartVideo(); Log_Start(); // put up the loading image so the user doesn't stare at a black screen... SCR_BeginLoadingPlaque(true); - +#ifdef CONFIG_MENU + if (cls.state != ca_dedicated) + MR_Init(); +#endif // 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"); + i = Sys_CheckParm("-benchmark"); if (i && i + 1 < sys.argc) if (!sv.active && !cls.demoplayback && !cls.connect_trying) { Cbuf_AddText(&cmd_client, va(vabuf, sizeof(vabuf), "timedemo %s\n", sys.argv[i + 1])); - Cbuf_Execute(&cmd_client); + Cbuf_Execute((&cmd_client)->cbuf); } // check for special demo mode // COMMANDLINEOPTION: Client: -demo runs a playdemo and quits - i = COM_CheckParm("-demo"); + i = Sys_CheckParm("-demo"); if (i && i + 1 < sys.argc) if (!sv.active && !cls.demoplayback && !cls.connect_trying) { Cbuf_AddText(&cmd_client, va(vabuf, sizeof(vabuf), "playdemo %s\n", sys.argv[i + 1])); - Cbuf_Execute(&cmd_client); + Cbuf_Execute((&cmd_client)->cbuf); } #ifdef CONFIG_VIDEO_CAPTURE // COMMANDLINEOPTION: Client: -capturedemo captures a playdemo and quits - i = COM_CheckParm("-capturedemo"); + i = Sys_CheckParm("-capturedemo"); if (i && i + 1 < sys.argc) if (!sv.active && !cls.demoplayback && !cls.connect_trying) { Cbuf_AddText(&cmd_client, va(vabuf, sizeof(vabuf), "playdemo %s\ncl_capturevideo 1\n", sys.argv[i + 1])); - Cbuf_Execute(&cmd_client); + Cbuf_Execute((&cmd_client)->cbuf); } #endif - if (cls.state == ca_dedicated || COM_CheckParm("-listen")) + if (cls.state == ca_dedicated || Sys_CheckParm("-listen")) if (!sv.active && !cls.demoplayback && !cls.connect_trying) { Cbuf_AddText(&cmd_client, "startmap_dm\n"); - Cbuf_Execute(&cmd_client); + Cbuf_Execute((&cmd_client)->cbuf); } if (!sv.active && !cls.demoplayback && !cls.connect_trying) @@ -790,7 +785,7 @@ static void Host_Init (void) #ifdef CONFIG_MENU Cbuf_AddText(&cmd_client, "togglemenu 1\n"); #endif - Cbuf_Execute(&cmd_client); + Cbuf_Execute((&cmd_client)->cbuf); } Con_DPrint("========Initialized=========\n"); @@ -810,7 +805,7 @@ to run quit through here before the final handoff to the sys code. */ void Host_Shutdown(void) { - static qboolean isdown = false; + static qbool isdown = false; if (isdown) {