eliminated calls to Matrix4x4_CreateIdentity (now copies from the already existing...

[xonotic/darkplaces.git] / host.c

diff --git a/host.c b/host.c
index e63a7f7cce31c59ed27fa87e8f136a8f4d7ec5d6..3cf4f493900412ecf165a4a1148e323a43bea777 100644 (file)
--- a/host.c
+++ b/host.c
@@ -122,6 +122,9 @@ void Host_Error (const char *error, ...)
        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);
@@ -141,6 +144,8 @@ void Host_Error (const char *error, ...)
 
        CL_Parse_DumpPacket();
 
+       CL_Parse_ErrorCleanUp();
+
        //PR_Crash();
 
        // print out where the crash happened, if it was caused by QC (and do a cleanup)
@@ -416,9 +421,9 @@ void SV_DropClient(qboolean crash)
                        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);
@@ -694,12 +699,6 @@ void Host_ServerFrame (void)
                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)
@@ -708,6 +707,9 @@ void Host_ServerFrame (void)
                // send all messages to the clients
                SV_SendClientMessages();
 
+               // clear the general datagram
+               SV_ClearDatagram();
+
                // if this server frame took too long, break out of the loop
                if (Sys_DoubleTime() >= aborttime)
                        break;
@@ -770,6 +772,11 @@ void _Host_Frame (float time)
 //
 //-------------------
 
+       // 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();
 
@@ -940,6 +947,8 @@ void Host_Init (void)
        os = "OpenBSD";
 #elif defined(MACOSX)
        os = "Mac OS X";
+#elif defined(__MORPHOS__)
+       os = "MorphOS";
 #else
        os = "Unknown";
 #endif
@@ -1008,8 +1017,6 @@ void Host_Init (void)
                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
@@ -1026,9 +1033,11 @@ void Host_Init (void)
        // 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)) {
@@ -1088,7 +1097,7 @@ void Host_Init (void)
 
        Con_DPrint("========Initialized=========\n");
 
-       Host_StartVideo();
+       //Host_StartVideo();
 }