X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=host.c;h=f1b218426f1158a5d5940bf9ab6c5e6857ee5d78;hb=d22b9d7114fbb102ae69422b2e3476183ccad3dc;hp=694099db66800df24f5676cef282d54c5f52b4ca;hpb=d5892a29c4f1e6954eb59ffc790d29d3f9925fe2;p=xonotic%2Fdarkplaces.git diff --git a/host.c b/host.c index 694099db..f1b21842 100644 --- a/host.c +++ b/host.c @@ -59,11 +59,18 @@ jmp_buf host_abortframe; cvar_t host_framerate = {0, "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"}; // shows time used by certain subsystems cvar_t host_speeds = {0, "host_speeds","0", "reports how much time is used in server/graphics/sound"}; -// LordHavoc: framerate upper cap -cvar_t cl_maxfps = {CVAR_SAVE, "cl_maxfps", "1000", "maximum fps cap, if game is running faster than this it will wait before running another frame (useful to make cpu time available to other programs)"}; +cvar_t cl_minfps = {CVAR_SAVE, "cl_minfps", "40", "minimum fps target - while the rendering performance is below this, it will drift toward lower quality"}; +cvar_t cl_minfps_fade = {CVAR_SAVE, "cl_minfps_fade", "0.2", "how fast the quality adapts to varying framerate"}; +cvar_t cl_minfps_qualitymax = {CVAR_SAVE, "cl_minfps_qualitymax", "1", "highest allowed drawdistance multiplier"}; +cvar_t cl_minfps_qualitymin = {CVAR_SAVE, "cl_minfps_qualitymin", "0.25", "lowest allowed drawdistance multiplier"}; +cvar_t cl_minfps_qualitypower = {CVAR_SAVE, "cl_minfps_qualitypower", "4", "raises quality value to a power of itself, higher values make quality drop more sharply in relation to framerate"}; +cvar_t cl_minfps_qualityscale = {CVAR_SAVE, "cl_minfps_qualityscale", "0.5", "multiplier for quality"}; +cvar_t cl_maxfps = {CVAR_SAVE, "cl_maxfps", "0", "maximum fps cap, 0 = unlimited, if game is running faster than this it will wait before running another frame (useful to make cpu time available to other programs)"}; cvar_t cl_maxidlefps = {CVAR_SAVE, "cl_maxidlefps", "20", "maximum fps cap when the game is not the active window (makes cpu time available to other programs"}; cvar_t developer = {0, "developer","0", "prints additional debugging messages and information (recommended for modders and level designers)"}; +cvar_t developer_loadfile = {0, "developer_loadfile","0", "prints name and size of every file loaded via the FS_LoadFile function (which is almost everything)"}; +cvar_t developer_loading = {0, "developer_loading","0", "prints information about files as they are loaded or unloaded successfully"}; cvar_t developer_entityparsing = {0, "developer_entityparsing", "0", "prints detailed network entities information each time a packet is received"}; cvar_t timestamps = {CVAR_SAVE, "timestamps", "0", "prints timestamps on console messages"}; @@ -96,7 +103,8 @@ void Host_Error (const char *error, ...) va_list argptr; // turn off rcon redirect if it was active when the crash occurred - rcon_redirect = false; + // to prevent loops when it is a networking problem + Con_Rcon_Redirect_Abort(); va_start (argptr,error); dpvsnprintf (hosterrorstring1,sizeof(hosterrorstring1),error,argptr); @@ -195,21 +203,32 @@ Host_InitLocal */ void Host_SaveConfig_f(void); void Host_LoadConfig_f(void); +extern cvar_t sv_writepicture_quality; static void Host_InitLocal (void) { - Cmd_AddCommand("saveconfig", Host_SaveConfig_f, "save settings to config.cfg immediately (also automatic when quitting)"); + Cmd_AddCommand("saveconfig", Host_SaveConfig_f, "save settings to config.cfg (or a specified filename) immediately (also automatic when quitting)"); Cmd_AddCommand("loadconfig", Host_LoadConfig_f, "reset everything and reload configs"); Cvar_RegisterVariable (&host_framerate); Cvar_RegisterVariable (&host_speeds); + Cvar_RegisterVariable (&cl_minfps); + Cvar_RegisterVariable (&cl_minfps_fade); + Cvar_RegisterVariable (&cl_minfps_qualitymax); + Cvar_RegisterVariable (&cl_minfps_qualitymin); + Cvar_RegisterVariable (&cl_minfps_qualitypower); + Cvar_RegisterVariable (&cl_minfps_qualityscale); Cvar_RegisterVariable (&cl_maxfps); Cvar_RegisterVariable (&cl_maxidlefps); Cvar_RegisterVariable (&developer); + Cvar_RegisterVariable (&developer_loadfile); + Cvar_RegisterVariable (&developer_loading); Cvar_RegisterVariable (&developer_entityparsing); Cvar_RegisterVariable (×tamps); Cvar_RegisterVariable (&timeformat); + + Cvar_RegisterVariable (&sv_writepicture_quality); } @@ -220,7 +239,7 @@ Host_SaveConfig_f Writes key bindings and archived cvars to config.cfg =============== */ -void Host_SaveConfig_f(void) +void Host_SaveConfig_to(const char *file) { qfile_t *f; @@ -229,10 +248,10 @@ void Host_SaveConfig_f(void) // LordHavoc: don't save a config if it crashed in startup if (host_framecount >= 3 && cls.state != ca_dedicated && !COM_CheckParm("-benchmark") && !COM_CheckParm("-capturedemo")) { - f = FS_Open ("config.cfg", "wb", false, false); + f = FS_OpenRealFile(file, "wb", false); if (!f) { - Con_Print("Couldn't write config.cfg.\n"); + Con_Printf("Couldn't write %s.\n", file); return; } @@ -242,7 +261,21 @@ void Host_SaveConfig_f(void) FS_Close (f); } } +void Host_SaveConfig(void) +{ + Host_SaveConfig_to("config.cfg"); +} +void Host_SaveConfig_f(void) +{ + const char *file = "config.cfg"; + if(Cmd_Argc() >= 2) { + file = Cmd_Argv(1); + Con_Printf("Saving to %s\n", file); + } + + Host_SaveConfig_to(file); +} /* =============== @@ -499,6 +532,13 @@ void Host_ShutdownServer(void) // make sure all the clients know we're disconnecting SV_VM_Begin(); + if(prog->loaded) + if(prog->funcoffsets.SV_Shutdown) + { + func_t s = prog->funcoffsets.SV_Shutdown; + prog->funcoffsets.SV_Shutdown = 0; // prevent it from getting called again + PRVM_ExecuteProgram(s,"SV_Shutdown() required"); + } for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++) if (host_client->active) SV_DropClient(false); // server shutdown @@ -624,6 +664,9 @@ void Host_Main(void) cl.islocalgame = NetConn_IsLocalGame(); + // begin gathering mouse input + in_mouse_x = in_mouse_y = 0; + // get new key events Sys_SendKeyEvents(); @@ -643,8 +686,8 @@ void Host_Main(void) // when a server is running we only execute console commands on server frames // (this mainly allows frikbot .way config files to work properly by staying in sync with the server qc) - // otherwise we execute them on all frames - if (sv_timer > 0 || !sv.active) + // otherwise we execute them on client frames + if (sv.active ? sv_timer > 0 : cl_timer > 0) { // process console commands Cbuf_Execute(); @@ -659,22 +702,15 @@ void Host_Main(void) wait = cl_timer * -1000000.0; else wait = max(cl_timer, sv_timer) * -1000000.0; - if (wait > 100000) - wait = 100000; + wait = bound(0, wait, 100000); - if (!cls.timedemo && wait > 0) + if (!cls.timedemo && wait >= 1) { double time0 = Sys_DoubleTime(); if (sv_checkforpacketsduringsleep.integer) - { - if (wait >= 1) - NetConn_SleepMicroseconds((int)wait); - } + NetConn_SleepMicroseconds((int)wait); else - { - if (wait >= 1000) - Sys_Sleep((int)wait / 1000); - } + Sys_Sleep((int)wait); svs.perf_acc_sleeptime += Sys_DoubleTime() - time0; continue; } @@ -792,10 +828,12 @@ void Host_Main(void) cl.realframetime = max(cl_timer, clframetime); } } - else if (vid_activewindow) - clframetime = cl.realframetime = max(cl_timer, 1.0 / max(5.0f, cl_maxfps.value)); + else if (vid_activewindow && cl_maxfps.value >= 1) + clframetime = cl.realframetime = max(cl_timer, 1.0 / cl_maxfps.value); + else if (!vid_activewindow && cl_maxidlefps.value >= 1) + clframetime = cl.realframetime = max(cl_timer, 1.0 / cl_maxidlefps.value); else - clframetime = cl.realframetime = max(cl_timer, 1.0 / max(5.0f, cl_maxidlefps.value)); + clframetime = cl.realframetime = cl_timer; // apply slowmo scaling clframetime *= cl.movevars_timescale; @@ -840,12 +878,8 @@ void Host_Main(void) if (host_speeds.integer) time1 = Sys_DoubleTime(); - //ui_update(); - CL_Video_Frame(); -#ifdef SUPPORT_GECKO CL_Gecko_Frame(); -#endif CL_UpdateScreen(); @@ -859,7 +893,7 @@ void Host_Main(void) cl.csqc_usecsqclistener = false; } else - S_Update(&r_view.matrix); + S_Update(&r_refdef.view.matrix); CDAudio_Update(); @@ -936,8 +970,8 @@ static void Host_Init (void) // COMMANDLINEOPTION: Console: -developer enables warnings and other notices (RECOMMENDED for mod developers) if (COM_CheckParm("-developer")) { - developer.value = developer.integer = 100; - developer.string = "100"; + developer.value = developer.integer = 1; + developer.string = "1"; } if (COM_CheckParm("-developer2")) @@ -980,23 +1014,7 @@ static void Host_Init (void) COM_InitGameType(); // construct a version string for the corner of the console -#if defined(__linux__) - os = "Linux"; -#elif defined(WIN32) - os = "Windows"; -#elif defined(__FreeBSD__) - os = "FreeBSD"; -#elif defined(__NetBSD__) - os = "NetBSD"; -#elif defined(__OpenBSD__) - os = "OpenBSD"; -#elif defined(MACOSX) - os = "Mac OS X"; -#elif defined(__MORPHOS__) - os = "MorphOS"; -#else - os = "Unknown"; -#endif + os = DP_OS_NAME; dpsnprintf (engineversion, sizeof (engineversion), "%s %s %s", gamename, os, buildstring); Con_Printf("%s\n", engineversion); @@ -1018,9 +1036,11 @@ static void Host_Init (void) Host_InitLocal(); Host_ServerOptions(); - if (cls.state != ca_dedicated) + if (cls.state == ca_dedicated) + Cmd_AddCommand ("disconnect", CL_Disconnect_f, "disconnect from server (or disconnect all clients if running a server)"); + else { - Con_Printf("Initializing client\n"); + Con_DPrintf("Initializing client\n"); R_Modules_Init(); Palette_Init(); @@ -1108,10 +1128,7 @@ static void Host_Init (void) if (!sv.active && !cls.demoplayback && !cls.connect_trying) { - if (gamemode == GAME_NEXUIZ) - Cbuf_AddText("togglemenu\nplayvideo logo\ncd loop 1\n"); - else - Cbuf_AddText("togglemenu\n"); + Cbuf_AddText("togglemenu\n"); Cbuf_Execute(); } @@ -1161,12 +1178,10 @@ void Host_Shutdown(void) // AK shutdown PRVM // AK hmm, no PRVM_Shutdown(); yet -#ifdef SUPPORT_GECKO CL_Gecko_Shutdown(); -#endif CL_Video_Shutdown(); - Host_SaveConfig_f(); + Host_SaveConfig(); CDAudio_Shutdown (); S_Terminate ();