-Added Host_AbortCurrentFrame to hide the longjump and make it usable by

[xonotic/darkplaces.git] / host.c

diff --git a/host.c b/host.c
index c076d67c72248cc3161b40146cad2a6e2b829425..608f9c2b5b9ae2b5b5fa3c5ba55d62a1f8138528 100644 (file)
--- a/host.c
+++ b/host.c
@@ -93,6 +93,18 @@ cvar_t temp1 = {0, "temp1","0"};
 cvar_t timestamps = {CVAR_SAVE, "timestamps", "0"};
 cvar_t timeformat = {CVAR_SAVE, "timeformat", "[%b %e %X] "};
 
+/*
+================
+Host_AbortCurrentFrame
+
+aborts the current host frame and goes on with the next one
+================
+*/
+void Host_AbortCurrentFrame(void)
+{
+       longjmp (host_abortserver, 1);
+}
+
 /*
 ================
 Host_Error
@@ -100,12 +112,11 @@ Host_Error
 This shuts down both the client and server
 ================
 */
-void PRVM_ProcessError(void);
-static char hosterrorstring1[4096];
-static char hosterrorstring2[4096];
-static qboolean hosterror = false;
 void Host_Error (const char *error, ...)
 {
+       static char hosterrorstring1[4096];
+       static char hosterrorstring2[4096];
+       static qboolean hosterror = false;
        va_list argptr;
 
        va_start (argptr,error);
@@ -127,14 +138,11 @@ void Host_Error (const char *error, ...)
 
        CL_Parse_DumpPacket();
 
-       PR_Crash();
+       //PR_Crash();
 
-       //PRVM_Crash(); // crash current prog
+       // print out where the crash happened, if it was caused by QC (and do a cleanup)
+       PRVM_Crash();
 
-       // crash all prvm progs
-       PRVM_CrashAll();
-
-       PRVM_ProcessError();
 
        Host_ShutdownServer (false);
 
@@ -146,7 +154,7 @@ void Host_Error (const char *error, ...)
 
        hosterror = false;
 
-       longjmp (host_abortserver, 1);
+       Host_AbortCurrentFrame();
 }
 
 void Host_ServerOptions (void)
@@ -394,7 +402,7 @@ void SV_DropClient(qboolean crash)
        Con_Printf("Client \"%s\" dropped\n", host_client->name);
 
        // make sure edict is not corrupt (from a level change for example)
-       host_client->edict = EDICT_NUM(host_client - svs.clients + 1);
+       host_client->edict = PRVM_EDICT_NUM(host_client - svs.clients + 1);
 
        if (host_client->netconnection)
        {
@@ -415,21 +423,22 @@ void SV_DropClient(qboolean crash)
        // call qc ClientDisconnect function
        // LordHavoc: don't call QC if server is dead (avoids recursive
        // Host_Error in some mods when they run out of edicts)
-       if (host_client->active && sv.active && host_client->edict && host_client->spawned)
+       if (host_client->clientconnectcalled && sv.active && host_client->edict)
        {
                // call the prog function for removing a client
                // this will set the body to a dead frame, among other things
-               int saveSelf = pr_global_struct->self;
-               pr_global_struct->self = EDICT_TO_PROG(host_client->edict);
-               PR_ExecuteProgram(pr_global_struct->ClientDisconnect, "QC function ClientDisconnect is missing");
-               pr_global_struct->self = saveSelf;
+               int saveSelf = prog->globals.server->self;
+               host_client->clientconnectcalled = false;
+               prog->globals.server->self = PRVM_EDICT_TO_PROG(host_client->edict);
+               PRVM_ExecuteProgram(prog->globals.server->ClientDisconnect, "QC function ClientDisconnect is missing");
+               prog->globals.server->self = saveSelf;
        }
 
        // remove leaving player from scoreboard
-       //host_client->edict->v->netname = PR_SetEngineString(host_client->name);
-       //if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_clientcolors)))
+       //host_client->edict->fields.server->netname = PRVM_SetEngineString(host_client->name);
+       //if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_clientcolors)))
        //      val->_float = 0;
-       //host_client->edict->v->frags = 0;
+       //host_client->edict->fields.server->frags = 0;
        host_client->name[0] = 0;
        host_client->colors = 0;
        host_client->frags = 0;
@@ -457,7 +466,7 @@ void SV_DropClient(qboolean crash)
        if (sv.active)
        {
                // clear a fields that matter to DP_SV_CLIENTNAME and DP_SV_CLIENTCOLORS, and also frags
-               ED_ClearEdict(host_client->edict);
+               PRVM_ED_ClearEdict(host_client->edict);
        }
 
        // clear the client struct (this sets active to false)
@@ -486,8 +495,7 @@ void Host_ShutdownServer(qboolean crash)
        if (!sv.active)
                return;
 
-       // print out where the crash happened, if it was caused by QC
-       PR_Crash();
+       SV_VM_Begin();
 
        NetConn_Heartbeat(2);
        NetConn_Heartbeat(2);
@@ -502,18 +510,22 @@ void Host_ShutdownServer(qboolean crash)
                Con_Printf("Host_ShutdownServer: NetConn_SendToAll failed for %u clients\n", count);
 
        for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
-               if (host_client->active)
+               if (host_client->active) {
                        SV_DropClient(crash); // server shutdown
+               }
 
        NetConn_CloseServerPorts();
 
        sv.active = false;
-
 //
 // clear structures
 //
        memset(&sv, 0, sizeof(sv));
        memset(svs.clients, 0, svs.maxclients*sizeof(client_t));
+
+       PRVM_ResetProg();
+
+       SV_VM_End();
 }
 
 
@@ -651,7 +663,6 @@ void Host_GetConsoleCommands (void)
        }
 }
 
-
 /*
 ==================
 Host_ServerFrame
@@ -669,10 +680,15 @@ void Host_ServerFrame (void)
                return;
        }
        sv.timer += host_realframetime;
+
+    
        // run the world state
        // don't allow simulation to run too fast or too slow or logic glitches can occur
        for (framecount = 0;framecount < framelimit && sv.timer > 0;framecount++)
        {
+               // setup the VM frame
+               SV_VM_Begin();
+
                if (cl.islocalgame)
                        advancetime = min(sv.timer, sys_ticrate.value);
                else
@@ -687,8 +703,6 @@ void Host_ServerFrame (void)
                if (sv.paused || (cl.islocalgame && (key_dest != key_game || key_consoleactive)))
                        sv.frametime = 0;
 
-               pr_global_struct->frametime = sv.frametime;
-
                // set the time and clear the general datagram
                SV_ClearDatagram();
 
@@ -705,7 +719,12 @@ void Host_ServerFrame (void)
 
                // send an heartbeat if enough time has passed since the last one
                NetConn_Heartbeat(0);
+
+               // end the server VM frame
+               SV_VM_End();
        }
+
+
        // if we fell behind too many frames just don't worry about it
        if (sv.timer > 0)
                sv.timer = 0;
@@ -959,8 +978,8 @@ void Host_Init (void)
        Mathlib_Init();
 
        NetConn_Init();
-       PR_Init();
-       PR_Cmd_Init();
+       //PR_Init();
+       //PR_Cmd_Init();
        PRVM_Init();
        Mod_Init();
        SV_Init();
@@ -1083,7 +1102,7 @@ void Host_Shutdown(void)
        CDAudio_Shutdown ();
        S_Terminate ();
        NetConn_Shutdown ();
-       PR_Shutdown ();
+       //PR_Shutdown ();
 
        if (cls.state != ca_dedicated)
        {