}
void Host_SaveConfig(void)
{
- Host_SaveConfig_to("config.cfg");
+ Host_SaveConfig_to(CONFIGFILENAME);
}
void Host_SaveConfig_f(void)
{
- const char *file = "config.cfg";
+ const char *file = CONFIGFILENAME;
if(Cmd_Argc() >= 2) {
file = Cmd_Argv(1);
// unlock the cvar default strings so they can be updated by the new default.cfg
Cvar_UnlockDefaults();
// reset cvars to their defaults, and then exec startup scripts again
- Cbuf_InsertText("cvar_resettodefaults_all;exec quake.rc\n");
+ Cbuf_InsertText("cvar_resettodefaults_all;exec " STARTCONFIGFILENAME "\n");
}
/*
if (sv.active ? sv_timer > 0 : cl_timer > 0)
{
// process console commands
- R_TimeReport("preconsole");
+// R_TimeReport("preconsole");
CL_VM_PreventInformationLeaks();
Cbuf_Execute();
- R_TimeReport("console");
+// R_TimeReport("console");
}
//Con_Printf("%6.0f %6.0f\n", cl_timer * 1000000.0, sv_timer * 1000000.0);
if (!cls.timedemo && wait >= 1)
{
double time0 = Sys_DoubleTime();
- if (sv_checkforpacketsduringsleep.integer)
+ if (sv_checkforpacketsduringsleep.integer && !sys_usenoclockbutbenchmark.integer)
NetConn_SleepMicroseconds((int)wait);
else
Sys_Sleep((int)wait);
svs.perf_acc_sleeptime += Sys_DoubleTime() - time0;
- R_TimeReport("sleep");
+// R_TimeReport("sleep");
continue;
}
+ R_TimeReport("---");
+
//-------------------
//
// server operations
NetConn_Heartbeat(0);
R_TimeReport("servernetwork");
}
+ else
+ {
+ // don't let r_speeds display jump around
+ R_TimeReport("serverphysics");
+ R_TimeReport("servernetwork");
+ }
//-------------------
//
R_TimeReport("client");
CL_UpdateScreen();
+ R_TimeReport("render");
if (host_speeds.integer)
time2 = Sys_DoubleTime();
// set up the default startmap_sp and startmap_dm aliases (mods can
// override these) and then execute the quake.rc startup script
if (gamemode == GAME_NEHAHRA)
- Cbuf_AddText("alias startmap_sp \"map nehstart\"\nalias startmap_dm \"map nehstart\"\nexec quake.rc\n");
+ Cbuf_AddText("alias startmap_sp \"map nehstart\"\nalias startmap_dm \"map nehstart\"\nexec " STARTCONFIGFILENAME "\n");
else if (gamemode == GAME_TRANSFUSION)
- Cbuf_AddText("alias startmap_sp \"map e1m1\"\n""alias startmap_dm \"map bb1\"\nexec quake.rc\n");
+ Cbuf_AddText("alias startmap_sp \"map e1m1\"\n""alias startmap_dm \"map bb1\"\nexec " STARTCONFIGFILENAME "\n");
else if (gamemode == GAME_TEU)
Cbuf_AddText("alias startmap_sp \"map start\"\nalias startmap_dm \"map start\"\nexec teu.rc\n");
else
- Cbuf_AddText("alias startmap_sp \"map start\"\nalias startmap_dm \"map start\"\nexec quake.rc\n");
+ Cbuf_AddText("alias startmap_sp \"map start\"\nalias startmap_dm \"map start\"\nexec " STARTCONFIGFILENAME "\n");
Cbuf_Execute();
// if stuffcmds wasn't run, then quake.rc is probably missing, use default
if (!host_stuffcmdsrun)
{
- Cbuf_AddText("exec default.cfg\nexec config.cfg\nexec autoexec.cfg\nstuffcmds\n");
+ Cbuf_AddText("exec default.cfg\nexec " CONFIGFILENAME "\nexec autoexec.cfg\nstuffcmds\n");
Cbuf_Execute();
}