Merge remote branch 'origin/master' into akari/irc

[xonotic/darkplaces.git] / host.c

diff --git a/host.c b/host.c
index 812c2146e60787e13d27640cbeaa53591794b148..dbc88c59b052280183ab5de951a5d49c57872ae5 100644 (file)
--- a/host.c
+++ b/host.c
@@ -468,11 +468,11 @@ void SV_DropClient(qboolean crash)
        {
                // call the prog function for removing a client
                // this will set the body to a dead frame, among other things
-               int saveSelf = prog->globals.server->self;
+               int saveSelf = PRVM_serverglobaledict(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;
+               PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(host_client->edict);
+               PRVM_ExecuteProgram(PRVM_serverfunction(ClientDisconnect), "QC function ClientDisconnect is missing");
+               PRVM_serverglobaledict(self) = saveSelf;
        }
 
        if (host_client->netconnection)
@@ -567,10 +567,10 @@ void Host_ShutdownServer(void)
        SV_VM_Begin();
        World_End(&sv.world);
        if(prog->loaded)
-               if(prog->funcoffsets.SV_Shutdown)
+               if(PRVM_serverfunction(SV_Shutdown))
                {
-                       func_t s = prog->funcoffsets.SV_Shutdown;
-                       prog->funcoffsets.SV_Shutdown = 0; // prevent it from getting called again
+                       func_t s = PRVM_serverfunction(SV_Shutdown);
+                       PRVM_serverfunction(SV_Shutdown) = 0; // prevent it from getting called again
                        PRVM_ExecuteProgram(s,"SV_Shutdown() required");
                }
        for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
@@ -861,7 +861,7 @@ void Host_Main(void)
                        
                        if (sv.paused == 1 && realtime > sv.pausedstart && sv.pausedstart > 0) {
                                prog->globals.generic[OFS_PARM0] = realtime - sv.pausedstart;
-                               PRVM_ExecuteProgram(prog->funcoffsets.SV_PausedTic, "QC function SV_PausedTic is missing");
+                               PRVM_ExecuteProgram(PRVM_serverfunction(SV_PausedTic), "QC function SV_PausedTic is missing");
                        }
 
                        // end the server VM frame
@@ -1082,7 +1082,7 @@ static void Host_Init (void)
                developer.string = "1";
        }
 
-       if (COM_CheckParm("-developer2"))
+       if (COM_CheckParm("-developer2") || COM_CheckParm("-developer3"))
        {
                developer.value = developer.integer = 1;
                developer.string = "1";
@@ -1096,6 +1096,12 @@ static void Host_Init (void)
                developer_memorydebug.string = "1";
        }
 
+       if (COM_CheckParm("-developer3"))
+       {
+               gl_paranoid.integer = 1;gl_paranoid.string = "1";
+               gl_printcheckerror.integer = 1;gl_printcheckerror.string = "1";
+       }
+
 // COMMANDLINEOPTION: Console: -nostdout disables text output to the terminal the game was launched from
        if (COM_CheckParm("-nostdout"))
                sys_nostdout = 1;