static qboolean hosterror = false;
va_list argptr;
+ // turn off rcon redirect if it was active when the crash occurred
+ rcon_redirect = false;
+
va_start (argptr,error);
dpvsnprintf (hosterrorstring1,sizeof(hosterrorstring1),error,argptr);
va_end (argptr);
CL_Parse_DumpPacket();
+ CL_Parse_ErrorCleanUp();
+
//PR_Crash();
// print out where the crash happened, if it was caused by QC (and do a cleanup)
buf.data = bufdata;
buf.maxsize = sizeof(bufdata);
MSG_WriteByte(&buf, svc_disconnect);
- NetConn_SendUnreliableMessage(host_client->netconnection, &buf);
- NetConn_SendUnreliableMessage(host_client->netconnection, &buf);
- NetConn_SendUnreliableMessage(host_client->netconnection, &buf);
+ NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol);
+ NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol);
+ NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol);
}
// break the net connection
NetConn_Close(host_client->netconnection);
*/
void Host_ServerFrame (void)
{
- // never run more than 1 frame per call because multiple frames per call it
- // does not handle overload gracefully, slowing down is better than a
- // sudden significant drop in framerate (or worse, freezing until the
- // problem goes away)
- int framecount, framelimit = 1;
- double advancetime;
+ // execute one or more server frames, with an upper limit on how much
+ // execution time to spend on server frames to avoid freezing the game if
+ // the server is overloaded, this execution time limit means the game will
+ // slow down if the server is taking too long.
+ int framecount, framelimit = 100;
+ double advancetime, aborttime;
if (!sv.active)
{
sv.timer = 0;
}
sv.timer += host_realframetime;
-
// run the world state
// don't allow simulation to run too fast or too slow or logic glitches can occur
+
+ // setup the VM frame
+ SV_VM_Begin();
+ // stop running server frames if the wall time reaches this value
+ aborttime = Sys_DoubleTime() + 0.05;
for (framecount = 0;framecount < framelimit && sv.timer > 0;framecount++)
{
- // setup the VM frame
- SV_VM_Begin();
-
- if (cl.islocalgame && !sv_fixedframeratesingleplayer.integer)
+ if (sys_ticrate.value <= 0)
+ advancetime = sv.timer;
+ else if (cl.islocalgame && !sv_fixedframeratesingleplayer.integer)
advancetime = min(sv.timer, sys_ticrate.value);
else
advancetime = sys_ticrate.value;
+ advancetime = min(advancetime, 0.1);
sv.timer -= advancetime;
// only advance time if not paused
if (sv.paused || (cl.islocalgame && (key_dest != key_game || key_consoleactive)))
sv.frametime = 0;
- // set the time and clear the general datagram
- SV_ClearDatagram();
-
- // check for network packets to the server each world step incase they
- // come in midframe (particularly if host is running really slow)
- NetConn_ServerFrame();
// move things around and think unless paused
if (sv.frametime)
// send all messages to the clients
SV_SendClientMessages();
- // send an heartbeat if enough time has passed since the last one
- NetConn_Heartbeat(0);
+ // clear the general datagram
+ SV_ClearDatagram();
- // end the server VM frame
- SV_VM_End();
+ // if this server frame took too long, break out of the loop
+ if (Sys_DoubleTime() >= aborttime)
+ break;
}
+ // end the server VM frame
+ SV_VM_End();
+
+ // send an heartbeat if enough time has passed since the last one
+ NetConn_Heartbeat(0);
// if we fell behind too many frames just don't worry about it
if (sv.timer > 0)
Cbuf_Execute();
// if running the server locally, make intentions now
- if (cls.state == ca_connected && sv.active)
- CL_SendCmd();
+ //if (cl.islocalgame)
+ // CL_SendCmd();
//-------------------
//
//
//-------------------
+ // receive server packets now, which might contain rcon commands, which
+ // may change level or other such things we don't want to have happen in
+ // the middle of Host_Frame
+ NetConn_ServerFrame();
+
// check for commands typed to the host
Host_GetConsoleCommands();
if (cls.state == ca_connected)
{
+ CL_ReadFromServer();
// if running the server remotely, send intentions now after
// the incoming messages have been read
- if (!sv.active)
- CL_SendCmd();
- CL_ReadFromServer();
+ //if (!cl.islocalgame)
+ // CL_SendCmd();
}
//ui_update();
os = "OpenBSD";
#elif defined(MACOSX)
os = "Mac OS X";
+#elif defined(__MORPHOS__)
+ os = "MorphOS";
#else
os = "Unknown";
#endif
Cbuf_AddText("alias startmap_sp \"map nehstart\"\nalias startmap_dm \"map nehstart\"\nexec quake.rc\n");
else if (gamemode == GAME_TRANSFUSION)
Cbuf_AddText("alias startmap_sp \"map e1m1\"\n""alias startmap_dm \"map bb1\"\nexec quake.rc\n");
- else if (gamemode == GAME_NEXUIZ)
- Cbuf_AddText("alias startmap_sp \"map nexdm01\"\nalias startmap_dm \"map nexdm01\"\nexec quake.rc\n");
else if (gamemode == GAME_TEU)
Cbuf_AddText("alias startmap_sp \"map start\"\nalias startmap_dm \"map start\"\nexec teu.rc\n");
else
// save console log up to this point to log_file if it was set by configs
Log_Start();
+ // put up the loading image so the user doesn't stare at a black screen...
+ SCR_BeginLoadingPlaque();
+
// FIXME: put this into some neat design, but the menu should be allowed to crash
// without crashing the whole game, so this should just be a short-time solution
- Host_StartVideo();
// here comes the not so critical stuff
if (setjmp(host_abortframe)) {
Con_DPrint("========Initialized=========\n");
- Host_StartVideo();
+ //Host_StartVideo();
}
projects / xonotic / darkplaces.git / blobdiff