// print out where the crash happened, if it was caused by QC (and do a cleanup)
PRVM_Crash(SVVM_prog);
PRVM_Crash(CLVM_prog);
+#ifdef CONFIG_MENU
PRVM_Crash(MVM_prog);
+#endif
cl.csqc_loaded = false;
Cvar_SetValueQuick(&csqc_progcrc, -1);
else
{
// default players in some games, singleplayer in most
- if (gamemode != GAME_GOODVSBAD2 && gamemode != GAME_NEXUIZ && gamemode != GAME_XONOTIC && gamemode != GAME_BATTLEMECH)
+ if (gamemode != GAME_GOODVSBAD2 && !IS_NEXUIZ_DERIVED(gamemode) && gamemode != GAME_BATTLEMECH)
svs.maxclients = 1;
}
}
{
// reset all cvars, commands and aliases to init values
Cmd_RestoreInitState();
+#ifdef CONFIG_MENU
// prepend a menu restart command to execute after the config
Cbuf_InsertText("\nmenu_restart\n");
+#endif
// reset cvars to their defaults, and then exec startup scripts again
Host_AddConfigText();
}
Host_Init();
realtime = 0;
+ host_dirtytime = Sys_DirtyTime();
for (;;)
{
if (setjmp(host_abortframe))
wait = 1; // because we cast to int
time0 = Sys_DirtyTime();
- if (sv_checkforpacketsduringsleep.integer && !sys_usenoclockbutbenchmark.integer && !svs.threaded)
+ if (sv_checkforpacketsduringsleep.integer && !sys_usenoclockbutbenchmark.integer && !svs.threaded) {
NetConn_SleepMicroseconds((int)wait);
+ if (cls.state != ca_dedicated)
+ NetConn_ClientFrame(); // helps server browser get good ping values
+ // TODO can we do the same for ServerFrame? Probably not.
+ }
else
Sys_Sleep((int)wait);
delta = Sys_DirtyTime() - time0;
R_TimeReport("client");
CL_UpdateScreen();
+ CL_MeshEntities_Reset();
R_TimeReport("render");
if (host_speeds.integer)
R_Modules_Init();
Palette_Init();
+#ifdef CONFIG_MENU
MR_Init_Commands();
+#endif
VID_Shared_Init();
VID_Init();
Render_Init();
// 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 <demoname> runs a timedemo and quits, results of any timedemo can be found in gamedir/benchmark.log (for example id1/benchmark.log)
if (!sv.active && !cls.demoplayback && !cls.connect_trying)
{
+#ifdef CONFIG_MENU
Cbuf_AddText("togglemenu 1\n");
+#endif
Cbuf_Execute();
}
Host_ShutdownServer ();
SV_UnlockThreadMutex();
+#ifdef CONFIG_MENU
// Shutdown menu
if(MR_Shutdown)
MR_Shutdown();
+#endif
// AK shutdown PRVM
// AK hmm, no PRVM_Shutdown(); yet