client_t *host_client;
jmp_buf host_abortframe;
+double host_starttime = 0;
// pretend frames take this amount of time (in seconds), 0 = realtime
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", "1000000", "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 host_sleep = {0, "host_sleep","0", "gives up some processing time to other applications each frame, value in milliseconds"};
+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"};
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);
}
}
- svs.maxclients = bound(1, svs.maxclients, MAX_SCOREBOARD);
+ svs.maxclients = svs.maxclients_next = bound(1, svs.maxclients, MAX_SCOREBOARD);
svs.clients = (client_t *)Mem_Alloc(sv_mempool, sizeof(client_t) * svs.maxclients);
*/
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 (or a specified filename) immediately (also automatic when quitting)");
Cvar_RegisterVariable (&host_framerate);
Cvar_RegisterVariable (&host_speeds);
+ Cvar_RegisterVariable (&host_sleep);
+ 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);
}
// 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 (file, "wb", false, false);
+ f = FS_OpenRealFile(file, "wb", false);
if (!f)
{
Con_Printf("Couldn't write %s.\n", file);
// make sure all the clients know we're disconnecting
SV_VM_Begin();
- for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
- if (host_client->active)
- SV_DropClient(false); // server shutdown
if(prog->loaded)
if(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
SV_VM_End();
NetConn_CloseServerPorts();
cl_timer = 0;
sv_timer = 0;
- realtime = Sys_DoubleTime();
+ realtime = host_starttime = Sys_DoubleTime();
for (;;)
{
if (setjmp(host_abortframe))
+ {
+ SCR_ClearLoadingScreen(false);
continue; // something bad happened, or the server disconnected
+ }
oldrealtime = realtime;
realtime = Sys_DoubleTime();
// 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();
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;
}
// send all messages to the clients
SV_SendClientMessages();
+
+ if (sv.paused == 1 && realtime > sv.pausedstart && sv.pausedstart > 0) {
+ prog->globals.generic[OFS_PARM0] = realtime - sv.pausedstart;
+ PRVM_ExecuteProgram(prog->funcoffsets.SV_PausedTic, "QC function SV_PausedTic is missing");
+ }
// end the server VM frame
SV_VM_End();
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;
if (host_framerate.value)
clframetime = host_framerate.value;
+ if (cl.paused || (cl.islocalgame && (key_dest != key_game || key_consoleactive)))
+ clframetime = 0;
+
if (cls.timedemo)
clframetime = cl.realframetime = cl_timer;
if (host_speeds.integer)
time1 = Sys_DoubleTime();
- //ui_update();
-
CL_Video_Frame();
CL_Gecko_Frame();
CDAudio_Update();
+ // reset gathering of mouse input
+ in_mouse_x = in_mouse_y = 0;
+
if (host_speeds.integer)
{
pass1 = (int)((time1 - time3)*1000000);
Con_Printf("%6ius total %6ius server %6ius gfx %6ius snd\n",
pass1+pass2+pass3, pass1, pass2, pass3);
}
+ wait = bound(0, host_sleep.value * 1000, 100000);
+ if (!cls.timedemo && wait >= 1)
+ Sys_Sleep((int)wait);
}
// if there is some time remaining from this frame, reset the timers
if (!vid_opened && cls.state != ca_dedicated)
{
vid_opened = true;
+ // 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();
VID_Start();
CDAudio_Startup();
}
// 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"))
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();
}
Cmd_Shutdown();
+ Key_Shutdown();
CL_Shutdown();
Sys_Shutdown();
Log_Close();
projects / xonotic / darkplaces.git / blobdiff