// how many frames have occurred
// (checked by Host_Error and Host_SaveConfig_f)
int host_framecount = 0;
+
+// Cloudwalk: set when Host_Init is executed
+qboolean host_init = false;
// LadyHavoc: set when quit is executed
qboolean host_shuttingdown = false;
dpvsnprintf (hosterrorstring1,sizeof(hosterrorstring1),error,argptr);
va_end (argptr);
- Con_Printf("Host_Error: %s\n", hosterrorstring1);
+ Con_Errorf("Host_Error: %s\n", hosterrorstring1);
// LadyHavoc: if crashing very early, or currently shutting down, do
// Sys_Error instead
f = FS_OpenRealFile(file, "wb", false);
if (!f)
{
- Con_Printf("Couldn't write %s.\n", file);
+ Con_Errorf("Couldn't write %s.\n", file);
return;
}
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);
}
/*
{
// warn if it's significant
if (deltacleantime < -0.01)
- Con_Printf("Host_Mingled: time stepped backwards (went from %f to %f, difference %f)\n", olddirtytime, dirtytime, deltacleantime);
+ Con_Warnf("Host_Mingled: time stepped backwards (went from %f to %f, difference %f)\n", olddirtytime, dirtytime, deltacleantime);
deltacleantime = 0;
}
else if (deltacleantime >= 1800)
{
- Con_Printf("Host_Mingled: time stepped forward (went from %f to %f, difference %f)\n", olddirtytime, dirtytime, deltacleantime);
+ Con_Warnf("Host_Mingled: time stepped forward (went from %f to %f, difference %f)\n", olddirtytime, dirtytime, deltacleantime);
deltacleantime = 0;
}
realtime += deltacleantime;
}
}
- if (slowmo.value < 0.00001 && slowmo.value != 0)
- Cvar_SetValueQuick(&slowmo, 0);
if (host_framerate.value < 0.00001 && host_framerate.value != 0)
Cvar_SetValueQuick(&host_framerate, 0);
// process console commands
// R_TimeReport("preconsole");
CL_VM_PreventInformationLeaks();
+ Cbuf_Frame(&cmd_clientfromserver);
Cbuf_Frame(&cmd_client);
Cbuf_Frame(&cmd_server);
Cbuf_Frame(&cmd_serverfromclient);
}
- if(cls.netcon)
- {
- Cbuf_Frame(&cmd_clientfromserver);
- }
-
// R_TimeReport("console");
}
framelimit = cl_maxphysicsframesperserverframe.integer;
aborttime = Sys_DirtyTime() + 0.1;
}
- if(slowmo.value > 0 && slowmo.value < 1)
- advancetime = min(advancetime, 0.1 / slowmo.value);
+ if(host_timescale.value > 0 && host_timescale.value < 1)
+ advancetime = min(advancetime, 0.1 / host_timescale.value);
else
advancetime = min(advancetime, 0.1);
// only advance time if not paused
// the game also pauses in singleplayer when menu or console is used
- sv.frametime = advancetime * slowmo.value;
+ sv.frametime = advancetime * host_timescale.value;
if (host_framerate.value)
sv.frametime = host_framerate.value;
if (sv.paused || (cl.islocalgame && (key_dest != key_game || key_consoleactive || cl.csqc_paused)))
// scale playback speed of demos by slowmo cvar
if (cls.demoplayback)
{
- clframetime *= slowmo.value;
+ clframetime *= host_timescale.value;
// if demo playback is paused, don't advance time at all
if (cls.demopaused)
clframetime = 0;
static void Host_InitSession(void)
{
int i;
+ char *buf;
Cvar_RegisterVariable(&sessionid);
Cvar_RegisterVariable(&locksession);
// load the session ID into the read-only cvar
if ((i = COM_CheckParm("-sessionid")) && (i + 1 < com_argc))
{
- char vabuf[1024];
if(com_argv[i+1][0] == '.')
Cvar_SetQuick(&sessionid, com_argv[i+1]);
else
- Cvar_SetQuick(&sessionid, va(vabuf, sizeof(vabuf), ".%s", com_argv[i+1]));
+ {
+ buf = (char *)Z_Malloc(strlen(com_argv[i+1]) + 2);
+ dpsnprintf(buf, sizeof(buf), ".%s", com_argv[i+1]);
+ Cvar_SetQuick(&sessionid, buf);
+ }
}
}
void Host_LockSession(void)
{
if(locksession.integer == 2)
{
- Con_Printf("WARNING: session lock %s could not be acquired. Please run with -sessionid and an unique session name. Continuing anyway.\n", p);
+ Con_Warnf("WARNING: session lock %s could not be acquired. Please run with -sessionid and an unique session name. Continuing anyway.\n", p);
}
else
{
qboolean dedicated_server = COM_CheckParm("-dedicated") || !cl_available;
cmd_state_t *cmd = &cmd_client;
+ host_init = true;
+
if (COM_CheckParm("-profilegameonly"))
Sys_AllowProfiling(false);
Thread_Init();
TaskQueue_Init();
- if (cls.state == ca_dedicated)
- {
- cmd = &cmd_server;
- Cmd_AddCommand(&cmd_server, "disconnect", CL_Disconnect_f, "disconnect from server (or disconnect all clients if running a server)");
- }
- else
- {
- Con_DPrintf("Initializing client\n");
-
- R_Modules_Init();
- Palette_Init();
-#ifdef CONFIG_MENU
- MR_Init_Commands();
-#endif
- VID_Shared_Init();
- VID_Init();
- Render_Init();
- S_Init();
- CDAudio_Init();
- Key_Init();
- CL_Init();
- }
+ CL_Init();
// save off current state of aliases, commands and cvars for later restore if FS_GameDir_f is called
// NOTE: menu commands are freed by Cmd_RestoreInitState
}
Host_AddConfigText(cmd);
- Cbuf_Execute(cmd);
- // if stuffcmds wasn't run, then quake.rc is probably missing, use default
- if (!host_stuffcmdsrun)
+ Host_StartVideo();
+
+ // if quake.rc is missing, use default
+ if (!FS_FileExists("quake.rc"))
{
- Cbuf_AddText(cmd, "exec default.cfg\nexec " CONFIGFILENAME "\nexec autoexec.cfg\nstuffcmds\n");
+ Cbuf_AddText(cmd, "exec default.cfg\nexec " CONFIGFILENAME "\nexec autoexec.cfg\n");
Cbuf_Execute(cmd);
}
+ host_init = false;
+
+ // run stuffcmds now, deferred previously because it can crash if a server starts that early
+ Cbuf_AddText(cmd,"stuffcmds\n");
+ Cbuf_Execute(cmd);
+
Log_Start();
// put up the loading image so the user doesn't stare at a black screen...
projects / xonotic / darkplaces.git / blobdiff