#include <time.h>
#include "libcurl.h"
-#ifdef CONFIG_CD
#include "cdaudio.h"
-#endif
#include "cl_video.h"
#include "progsvm.h"
#include "csprogs.h"
#include "sv_demo.h"
#include "snd_main.h"
+#include "taskqueue.h"
#include "thread.h"
#include "utf8lib.h"
// how many frames have occurred
// (checked by Host_Error and Host_SaveConfig_f)
int host_framecount = 0;
-// LordHavoc: set when quit is executed
+// LadyHavoc: set when quit is executed
qboolean host_shuttingdown = false;
// the accumulated mainloop time since application started (with filtering), without any slowmo or clamping
Con_Printf("Host_Error: %s\n", hosterrorstring1);
- // LordHavoc: if crashing very early, or currently shutting down, do
+ // LadyHavoc: if crashing very early, or currently shutting down, do
// Sys_Error instead
if (host_framecount < 3 || host_shuttingdown)
Sys_Error ("Host_Error: %s", hosterrorstring1);
// 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;
}
}
// dedicated servers initialize the host but don't parse and set the
// config.cfg cvars
- // LordHavoc: don't save a config if it crashed in startup
+ // LadyHavoc: 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_OpenRealFile(file, "wb", false);
{
// 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();
}
// tell the client to be gone
if (!crash)
{
- // LordHavoc: no opportunity for resending, so use unreliable 3 times
+ // LadyHavoc: no opportunity for resending, so use unreliable 3 times
unsigned char bufdata[8];
sizebuf_t buf;
memset(&buf, 0, sizeof(buf));
}
// call qc ClientDisconnect function
- // LordHavoc: don't call QC if server is dead (avoids recursive
+ // LadyHavoc: don't call QC if server is dead (avoids recursive
// Host_Error in some mods when they run out of edicts)
if (host_client->clientconnectcalled && sv.active && host_client->edict)
{
Host_Init();
realtime = 0;
+ host_dirtytime = Sys_DirtyTime();
for (;;)
{
if (setjmp(host_abortframe))
if (host_framerate.value < 0.00001 && host_framerate.value != 0)
Cvar_SetValue("host_framerate", 0);
+ TaskQueue_Frame(false);
+
// keep the random time dependent, but not when playing demos/benchmarking
if(!*sv_random_seed.string && !cls.demoplayback)
rand();
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)
else
S_Update(&r_refdef.view.matrix);
-#ifdef CONFIG_CD
CDAudio_Update();
R_TimeReport("audio");
-#endif
// reset gathering of mouse input
in_mouse_x = in_mouse_y = 0;
// 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();
-#ifdef CONFIG_CD
CDAudio_Startup();
-#endif
}
}
if (COM_CheckParm("-profilegameonly"))
Sys_AllowProfiling(false);
- // LordHavoc: quake never seeded the random number generator before... heh
+ // LadyHavoc: quake never seeded the random number generator before... heh
if (COM_CheckParm("-benchmark"))
srand(0); // predictable random sequence for -benchmark
else
srand((unsigned int)time(NULL));
// FIXME: this is evil, but possibly temporary
- // LordHavoc: doesn't seem very temporary...
- // LordHavoc: made this a saved cvar
+ // LadyHavoc: doesn't seem very temporary...
+ // LadyHavoc: made this a saved cvar
// COMMANDLINEOPTION: Console: -developer enables warnings and other notices (RECOMMENDED for mod developers)
if (COM_CheckParm("-developer"))
{
Host_ServerOptions();
Thread_Init();
+ TaskQueue_Init();
if (cls.state == ca_dedicated)
Cmd_AddCommand ("disconnect", CL_Disconnect_f, "disconnect from server (or disconnect all clients if running a server)");
R_Modules_Init();
Palette_Init();
+#ifdef CONFIG_MENU
MR_Init_Commands();
+#endif
VID_Shared_Init();
VID_Init();
Render_Init();
S_Init();
-#ifdef CONFIG_CD
CDAudio_Init();
-#endif
Key_Init();
CL_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
Host_SaveConfig();
-#ifdef CONFIG_CD
CDAudio_Shutdown ();
-#endif
S_Terminate ();
Curl_Shutdown ();
NetConn_Shutdown ();
}
SV_StopThread();
+ TaskQueue_Shutdown();
Thread_Shutdown();
Cmd_Shutdown();
Key_Shutdown();
projects / xonotic / darkplaces.git / blobdiff