Remove hook system. Was a fun little experiment but is too bulky and impractical

[xonotic/darkplaces.git] / csprogs.c

diff --git a/csprogs.c b/csprogs.c
index 75a8cf9448d281e786f102dd582419724fe7cb86..7f1ea820cbb54574bbd119aeb00d8db5393ab944 100644 (file)
--- a/csprogs.c
+++ b/csprogs.c
@@ -20,10 +20,10 @@ void CL_VM_PreventInformationLeaks(void)
        prvm_prog_t *prog = CLVM_prog;
        if(!cl.csqc_loaded)
                return;
-       CSQC_BEGIN
-               VM_ClearTraceGlobals(prog);
-               PRVM_clientglobalfloat(trace_networkentity) = 0;
-       CSQC_END
+CSQC_BEGIN
+       VM_ClearTraceGlobals(prog);
+       PRVM_clientglobalfloat(trace_networkentity) = 0;
+CSQC_END
 }
 
 //[515]: these are required funcs
@@ -442,20 +442,20 @@ qboolean CL_VM_InputEvent (int eventtype, float x, float y)
        if(!cl.csqc_loaded)
                return false;
 
-       CSQC_BEGIN
-               if (!PRVM_clientfunction(CSQC_InputEvent))
-                       r = false;
-               else
-               {
-                       PRVM_clientglobalfloat(time) = cl.time;
-                       PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity];
-                       PRVM_G_FLOAT(OFS_PARM0) = eventtype;
-                       PRVM_G_FLOAT(OFS_PARM1) = x; // key or x
-                       PRVM_G_FLOAT(OFS_PARM2) = y; // ascii or y
-                       prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_InputEvent), "QC function CSQC_InputEvent is missing");
-                       r = CSQC_RETURNVAL != 0;
-               }
-       CSQC_END
+CSQC_BEGIN
+       if (!PRVM_clientfunction(CSQC_InputEvent))
+               r = false;
+       else
+       {
+               PRVM_clientglobalfloat(time) = cl.time;
+               PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity];
+               PRVM_G_FLOAT(OFS_PARM0) = eventtype;
+               PRVM_G_FLOAT(OFS_PARM1) = x; // key or x
+               PRVM_G_FLOAT(OFS_PARM2) = y; // ascii or y
+               prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_InputEvent), "QC function CSQC_InputEvent is missing");
+               r = CSQC_RETURNVAL != 0;
+       }
+CSQC_END
        return r;
 }
 
@@ -485,6 +485,8 @@ qboolean CL_VM_UpdateView (double frametime)
                r_refdef.scene.numlights = 0;
                // polygonbegin without draw2d arg has to guess
                prog->polygonbegin_guess2d = false;
+               // free memory for resources that are no longer referenced
+               PRVM_GarbageCollection(prog);
                // pass in width and height as parameters (EXT_CSQC_1)
                PRVM_G_FLOAT(OFS_PARM0) = vid.width;
                PRVM_G_FLOAT(OFS_PARM1) = vid.height;
@@ -500,7 +502,7 @@ qboolean CL_VM_UpdateView (double frametime)
        return true;
 }
 
-qboolean CL_VM_ConsoleCommand (const char *cmd)
+qboolean CL_VM_ConsoleCommand (const char *text)
 {
        prvm_prog_t *prog = CLVM_prog;
        int restorevm_tempstringsbuf_cursize;
@@ -513,7 +515,7 @@ qboolean CL_VM_ConsoleCommand (const char *cmd)
                PRVM_clientglobalfloat(time) = cl.time;
                PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity];
                restorevm_tempstringsbuf_cursize = prog->tempstringsbuf.cursize;
-               PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(prog, cmd);
+               PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(prog, text);
                prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_ConsoleCommand), "QC function CSQC_ConsoleCommand is missing");
                prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
                r = CSQC_RETURNVAL != 0;
@@ -882,7 +884,7 @@ static void CLVM_end_increase_edicts(prvm_prog_t *prog)
 
        // link every entity except world
        for (i = 1, ent = prog->edicts;i < prog->num_edicts;i++, ent++)
-               if (!ent->priv.server->free)
+               if (!ent->priv.server->free && !VectorCompare(PRVM_clientedictvector(ent, absmin), PRVM_clientedictvector(ent, absmax)))
                        CL_LinkEdict(ent);
 }
 
@@ -1031,7 +1033,7 @@ void CL_VM_Init (void)
                {
                        if (cls.demoplayback)
                        {
-                               Con_Printf("^1Warning: Your %s is not the same version as the demo was recorded with (CRC/size are %i/%i but should be %i/%i)\n", csqc_progname.string, csprogsdatacrc, (int)csprogsdatasize, requiredcrc, requiredsize);
+                               Con_Warnf("Warning: Your %s is not the same version as the demo was recorded with (CRC/size are %i/%i but should be %i/%i)\n", csqc_progname.string, csprogsdatacrc, (int)csprogsdatasize, requiredcrc, requiredsize);
                                // Mem_Free(csprogsdata);
                                // return;
                                // We WANT to continue here, and play the demo with different csprogs!
@@ -1040,7 +1042,7 @@ void CL_VM_Init (void)
                        else
                        {
                                Mem_Free(csprogsdata);
-                               Con_Printf("^1Your %s is not the same version as the server (CRC is %i/%i but should be %i/%i)\n", csqc_progname.string, csprogsdatacrc, (int)csprogsdatasize, requiredcrc, requiredsize);
+                               Con_Errorf("Your %s is not the same version as the server (CRC is %i/%i but should be %i/%i)\n", csqc_progname.string, csprogsdatacrc, (int)csprogsdatasize, requiredcrc, requiredsize);
                                CL_Disconnect();
                                return;
                        }
@@ -1051,9 +1053,9 @@ void CL_VM_Init (void)
                if (requiredcrc >= 0)
                {
                        if (cls.demoplayback)
-                               Con_Printf("CL_VM_Init: demo requires CSQC, but \"%s\" wasn't found\n", csqc_progname.string);
+                               Con_Errorf("CL_VM_Init: demo requires CSQC, but \"%s\" wasn't found\n", csqc_progname.string);
                        else
-                               Con_Printf("CL_VM_Init: server requires CSQC, but \"%s\" wasn't found\n", csqc_progname.string);
+                               Con_Errorf("CL_VM_Init: server requires CSQC, but \"%s\" wasn't found\n", csqc_progname.string);
                        CL_Disconnect();
                }
                return;
@@ -1091,7 +1093,7 @@ void CL_VM_Init (void)
 
        if (!prog->loaded)
        {
-               Host_Error("CSQC %s ^2failed to load\n", csprogsfn);
+               Host_Error("CSQC %s failed to load\n", csprogsfn);
                if(!sv.active)
                        CL_Disconnect();
                Mem_Free(csprogsdata);
@@ -1161,21 +1163,21 @@ void CL_VM_Init (void)
 void CL_VM_ShutDown (void)
 {
        prvm_prog_t *prog = CLVM_prog;
-       Cmd_ClearCsqcFuncs(&cmd_client);
+       Cmd_ClearCSQCCommands(&cmd_client);
        //Cvar_SetValueQuick(&csqc_progcrc, -1);
        //Cvar_SetValueQuick(&csqc_progsize, -1);
        if(!cl.csqc_loaded)
                return;
-       CSQC_BEGIN
-               if (prog->loaded)
-               {
-                       PRVM_clientglobalfloat(time) = cl.time;
-                       PRVM_clientglobaledict(self) = 0;
-                       if (PRVM_clientfunction(CSQC_Shutdown))
-                               prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Shutdown), "QC function CSQC_Shutdown is missing");
-               }
-               PRVM_Prog_Reset(prog);
-       CSQC_END
+CSQC_BEGIN
+       if (prog->loaded)
+       {
+               PRVM_clientglobalfloat(time) = cl.time;
+               PRVM_clientglobaledict(self) = 0;
+               if (PRVM_clientfunction(CSQC_Shutdown))
+                       prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Shutdown), "QC function CSQC_Shutdown is missing");
+       }
+       PRVM_Prog_Reset(prog);
+CSQC_END
        Con_DPrint("CSQC ^1unloaded\n");
        cl.csqc_loaded = false;
 }