cmd: Dynamically allocate the command interpreters

[xonotic/darkplaces.git] / csprogs.c

diff --git a/csprogs.c b/csprogs.c
index 94e3b9d0aa6e6ad9feb641184925ade922222ea5..80666f5edaaf06eb652cdd2a01021694a92d0316 100644 (file)
--- a/csprogs.c
+++ b/csprogs.c
@@ -487,9 +487,16 @@ qbool CL_VM_UpdateView (double frametime)
                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)
+               // pass in width and height and menu/focus state as parameters (EXT_CSQC_1)
                PRVM_G_FLOAT(OFS_PARM0) = vid.width;
                PRVM_G_FLOAT(OFS_PARM1) = vid.height;
+               /*
+                * This should be fine for now but FTEQW uses flags for keydest
+                * and checks that an array called "eyeoffset" is 0
+                * 
+                * Just a note in case there's compatibility problems later
+                */
+               PRVM_G_FLOAT(OFS_PARM2) = key_dest == key_game;
                prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_UpdateView), "QC function CSQC_UpdateView is missing");
                //VectorCopy(oldangles, cl.viewangles);
                // Dresk : Reset Dmg Globals Here
@@ -564,7 +571,7 @@ void CL_VM_Parse_StuffCmd (const char *msg)
                int crcflags = csqc_progcrc.flags;
                csqc_progcrc.flags &= ~CF_READONLY;
                csqc_progsize.flags &= ~CF_READONLY;
-               Cmd_ExecuteString(&cmd_client, msg, src_local, true);
+               Cmd_ExecuteString(cmd_client, msg, src_local, true);
                csqc_progcrc.flags = csqc_progsize.flags = crcflags;
                return;
        }
@@ -596,7 +603,7 @@ void CL_VM_Parse_StuffCmd (const char *msg)
                                l = sizeof(buf) - 1;
                        strlcpy(buf, p, l + 1); // strlcpy needs a + 1 as it includes the newline!
 
-                       Cmd_ExecuteString(&cmd_client, buf, src_local, true);
+                       Cmd_ExecuteString(cmd_client, buf, src_local, true);
 
                        p += l;
                        if(*p == '\n')
@@ -604,13 +611,13 @@ void CL_VM_Parse_StuffCmd (const char *msg)
                        else
                                break; // end of string or overflow
                }
-               Cmd_ExecuteString(&cmd_client, "curl --clear_autodownload", src_local, true); // don't inhibit CSQC loading
+               Cmd_ExecuteString(cmd_client, "curl --clear_autodownload", src_local, true); // don't inhibit CSQC loading
                return;
        }
 
        if(!cl.csqc_loaded)
        {
-               Cbuf_AddText(&cmd_client, msg);
+               Cbuf_AddText(cmd_client, msg);
                return;
        }
        CSQC_BEGIN
@@ -624,7 +631,7 @@ void CL_VM_Parse_StuffCmd (const char *msg)
                prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
        }
        else
-               Cbuf_AddText(&cmd_client, msg);
+               Cbuf_AddText(cmd_client, msg);
        CSQC_END
 }
 
@@ -1049,7 +1056,7 @@ void CL_VM_Init (void)
                return;
        }
 
-       PRVM_Prog_Init(prog, &cmd_client);
+       PRVM_Prog_Init(prog, cmd_client);
 
        // allocate the mempools
        prog->progs_mempool = Mem_AllocPool(csqc_progname.string, 0, NULL);
@@ -1149,7 +1156,7 @@ void CL_VM_Init (void)
 void CL_VM_ShutDown (void)
 {
        prvm_prog_t *prog = CLVM_prog;
-       Cmd_ClearCSQCCommands(&cmd_client);
+       Cmd_ClearCSQCCommands(cmd_client);
        //Cvar_SetValueQuick(&csqc_progcrc, -1);
        //Cvar_SetValueQuick(&csqc_progsize, -1);
        if(!cl.csqc_loaded)