]> git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - csprogs.c
CONTRIBUTING: Fix typos
[xonotic/darkplaces.git] / csprogs.c
index 14946c82a3540233050f249e12a8106d3de6bf28..da5bd77eeff2f768aa7b3a723166a58c0eddc915 100644 (file)
--- a/csprogs.c
+++ b/csprogs.c
@@ -32,30 +32,34 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //[515]: omg !!! optimize it ! a lot of hacks here and there also :P
 
 #define CSQC_RETURNVAL prog->globals.fp[OFS_RETURN]
-#define CSQC_BEGIN
-#define CSQC_END
 
 void CL_VM_PreventInformationLeaks(void)
 {
        prvm_prog_t *prog = CLVM_prog;
-       if(!cl.csqc_loaded)
+
+       if(!prog->loaded)
                return;
-CSQC_BEGIN
+
        VM_ClearTraceGlobals(prog);
        PRVM_clientglobalfloat(trace_networkentity) = 0;
-CSQC_END
 }
 
-//[515]: these are required funcs
-static const char *cl_required_func[] =
-{
-       "CSQC_Init",
-       "CSQC_InputEvent",
-       "CSQC_UpdateView",
-       "CSQC_ConsoleCommand",
-};
 
-static int cl_numrequiredfunc = sizeof(cl_required_func) / sizeof(char*);
+/** Previous DP versions declined to load csprogs if it lacked any of:
+ * CSQC_Init, CSQC_InputEvent, CSQC_UpdateView, CSQC_ConsoleCommand
+ * whereas in FTE and QSS-based engines the minimum is either CSQC_UpdateView
+ * or CSQC_DrawHud (only called in CSQC_SIMPLE aka hud-only mode)
+ * and the other funcs are optional, so we now behave the same here.
+ */
+static void CL_CheckRequiredFuncs(prvm_prog_t *prog, const char *filename)
+{
+       if (PRVM_ED_FindFunction(prog, "CSQC_UpdateView"))
+               return;
+       else if (PRVM_ED_FindFunction(prog, "CSQC_DrawHud"))
+               prog->flag |= PRVM_CSQC_SIMPLE;
+       else
+               prog->error_cmd("%s: no CSQC_UpdateView (EXT_CSQC) or CSQC_DrawHud (CSQC_SIMPLE) function found in %s", prog->name, filename);
+}
 
 #define CL_REQFIELDS (sizeof(cl_reqfields) / sizeof(prvm_required_field_t))
 
@@ -218,26 +222,25 @@ prvm_required_field_t cl_reqglobals[] =
 void CL_VM_UpdateDmgGlobals (int dmg_take, int dmg_save, vec3_t dmg_origin)
 {
        prvm_prog_t *prog = CLVM_prog;
-       if(cl.csqc_loaded)
+
+       if(prog->loaded)
        {
-               CSQC_BEGIN
                PRVM_clientglobalfloat(dmg_take) = dmg_take;
                PRVM_clientglobalfloat(dmg_save) = dmg_save;
                VectorCopy(dmg_origin, PRVM_clientglobalvector(dmg_origin));
-               CSQC_END
        }
 }
 
 void CSQC_UpdateNetworkTimes(double newtime, double oldtime)
 {
        prvm_prog_t *prog = CLVM_prog;
-       if(!cl.csqc_loaded)
+
+       if(!prog->loaded)
                return;
-       CSQC_BEGIN
+
        PRVM_clientglobalfloat(servertime) = newtime;
        PRVM_clientglobalfloat(serverprevtime) = oldtime;
        PRVM_clientglobalfloat(serverdeltatime) = newtime - oldtime;
-       CSQC_END
 }
 
 //[515]: set globals before calling R_UpdateView, WEIRD CRAP
@@ -245,37 +248,36 @@ static void CSQC_SetGlobals (double frametime)
 {
        vec3_t pmove_org;
        prvm_prog_t *prog = CLVM_prog;
-       CSQC_BEGIN
-               PRVM_clientglobalfloat(time) = cl.time;
-               PRVM_clientglobalfloat(cltime) = host.realtime; // Spike named it that way.
-               PRVM_clientglobalfloat(frametime) = frametime;
-               PRVM_clientglobalfloat(servercommandframe) = cls.servermovesequence;
-               PRVM_clientglobalfloat(clientcommandframe) = cl.movecmd[0].sequence;
-               VectorCopy(cl.viewangles, PRVM_clientglobalvector(input_angles));
-               // // FIXME: this actually belongs into getinputstate().. [12/17/2007 Black]
-               PRVM_clientglobalfloat(input_buttons) = cl.movecmd[0].buttons;
-               VectorSet(PRVM_clientglobalvector(input_movevalues), cl.movecmd[0].forwardmove, cl.movecmd[0].sidemove, cl.movecmd[0].upmove);
-               VectorCopy(cl.csqc_vieworiginfromengine, cl.csqc_vieworigin);
-               VectorCopy(cl.csqc_viewanglesfromengine, cl.csqc_viewangles);
-
-               // LadyHavoc: Spike says not to do this, but without pmove_org the
-               // CSQC is useless as it can't alter the view origin without
-               // completely replacing it
-               Matrix4x4_OriginFromMatrix(&cl.entities[cl.viewentity].render.matrix, pmove_org);
-               VectorCopy(pmove_org, PRVM_clientglobalvector(pmove_org));
-               VectorCopy(cl.movement_velocity, PRVM_clientglobalvector(pmove_vel));
-               PRVM_clientglobalfloat(pmove_onground) = cl.onground;
-               PRVM_clientglobalfloat(pmove_inwater) = cl.inwater;
-
-               VectorCopy(cl.viewangles, PRVM_clientglobalvector(view_angles));
-               VectorCopy(cl.punchangle, PRVM_clientglobalvector(view_punchangle));
-               VectorCopy(cl.punchvector, PRVM_clientglobalvector(view_punchvector));
-               PRVM_clientglobalfloat(maxclients) = cl.maxclients;
-
-               PRVM_clientglobalfloat(player_localentnum) = cl.viewentity;
-
-               CSQC_R_RecalcView();
-       CSQC_END
+
+       PRVM_clientglobalfloat(time) = cl.time;
+       PRVM_clientglobalfloat(cltime) = host.realtime; // Spike named it that way.
+       PRVM_clientglobalfloat(frametime) = frametime;
+       PRVM_clientglobalfloat(servercommandframe) = cls.servermovesequence;
+       PRVM_clientglobalfloat(clientcommandframe) = cl.movecmd[0].sequence;
+       VectorCopy(cl.viewangles, PRVM_clientglobalvector(input_angles));
+       // // FIXME: this actually belongs into getinputstate().. [12/17/2007 Black]
+       PRVM_clientglobalfloat(input_buttons) = cl.movecmd[0].buttons;
+       VectorSet(PRVM_clientglobalvector(input_movevalues), cl.movecmd[0].forwardmove, cl.movecmd[0].sidemove, cl.movecmd[0].upmove);
+       VectorCopy(cl.csqc_vieworiginfromengine, cl.csqc_vieworigin);
+       VectorCopy(cl.csqc_viewanglesfromengine, cl.csqc_viewangles);
+
+       // LadyHavoc: Spike says not to do this, but without pmove_org the
+       // CSQC is useless as it can't alter the view origin without
+       // completely replacing it
+       Matrix4x4_OriginFromMatrix(&cl.entities[cl.viewentity].render.matrix, pmove_org);
+       VectorCopy(pmove_org, PRVM_clientglobalvector(pmove_org));
+       VectorCopy(cl.movement_velocity, PRVM_clientglobalvector(pmove_vel));
+       PRVM_clientglobalfloat(pmove_onground) = cl.onground;
+       PRVM_clientglobalfloat(pmove_inwater) = cl.inwater;
+
+       VectorCopy(cl.viewangles, PRVM_clientglobalvector(view_angles));
+       VectorCopy(cl.punchangle, PRVM_clientglobalvector(view_punchangle));
+       VectorCopy(cl.punchvector, PRVM_clientglobalvector(view_punchvector));
+       PRVM_clientglobalfloat(maxclients) = cl.maxclients;
+
+       PRVM_clientglobalfloat(player_localentnum) = cl.viewentity;
+
+       CSQC_R_RecalcView();
 }
 
 void CSQC_Predraw (prvm_edict_t *ed)
@@ -459,10 +461,9 @@ qbool CL_VM_InputEvent (int eventtype, float x, float y)
        prvm_prog_t *prog = CLVM_prog;
        qbool r;
 
-       if(!cl.csqc_loaded)
+       if(!prog->loaded)
                return false;
 
-CSQC_BEGIN
        if (!PRVM_clientfunction(CSQC_InputEvent))
                r = false;
        else
@@ -475,7 +476,6 @@ CSQC_BEGIN
                prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_InputEvent), "QC function CSQC_InputEvent is missing");
                r = CSQC_RETURNVAL != 0;
        }
-CSQC_END
        return r;
 }
 
@@ -489,60 +489,94 @@ qbool CL_VM_UpdateView (double frametime)
        emptyvector[1] = 0;
        emptyvector[2] = 0;
 //     vec3_t oldangles;
-       if(!cl.csqc_loaded)
+
+       if(!prog->loaded)
                return false;
+
        R_TimeReport("pre-UpdateView");
-       CSQC_BEGIN
-               csqc_original_r_refdef_view = r_refdef.view;
-               csqc_main_r_refdef_view = r_refdef.view;
-               //VectorCopy(cl.viewangles, oldangles);
-               PRVM_clientglobalfloat(time) = cl.time;
-               PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity];
-               CSQC_SetGlobals(frametime);
-               // clear renderable entity and light lists to prevent crashes if the
-               // CSQC_UpdateView function does not call R_ClearScene as it should
-               r_refdef.scene.numentities = 0;
-               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 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
-               CL_VM_UpdateDmgGlobals(0, 0, emptyvector);
-               r_refdef.view = csqc_main_r_refdef_view;
-               R_RenderView_UpdateViewVectors(); // we have to do this, as we undid the scene render doing this for us
-       CSQC_END
+
+       csqc_original_r_refdef_view = r_refdef.view;
+       csqc_main_r_refdef_view = r_refdef.view;
+       //VectorCopy(cl.viewangles, oldangles);
+       PRVM_clientglobalfloat(time) = cl.time;
+       PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity];
+       CSQC_SetGlobals(frametime);
+       // clear renderable entity and light lists to prevent crashes if the
+       // CSQC_UpdateView function does not call R_ClearScene as it should
+       r_refdef.scene.numentities = 0;
+       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 and menu/focus state as parameters (EXT_CSQC_1)
+       PRVM_G_FLOAT(OFS_PARM0) = vid.mode.width;
+       PRVM_G_FLOAT(OFS_PARM1) = vid.mode.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
+       CL_VM_UpdateDmgGlobals(0, 0, emptyvector);
+       r_refdef.view = csqc_main_r_refdef_view;
+       R_RenderView_UpdateViewVectors(); // we have to do this, as we undid the scene render doing this for us
 
        R_TimeReport("UpdateView");
        return true;
 }
 
+void CL_VM_DrawHud(double frametime)
+{
+       prvm_prog_t *prog = CLVM_prog;
+
+       R_TimeReport("pre-DrawHud");
+
+       PRVM_clientglobalfloat(time) = cl.time;
+       PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity];
+       CSQC_SetGlobals(frametime);
+
+       PRVM_GarbageCollection(prog);
+
+       // width and height parameters are virtual in CSQC_SIMPLE engines
+       VectorSet(PRVM_G_VECTOR(OFS_PARM0), vid_conwidth.integer, vid_conheight.integer, 0);
+       PRVM_G_FLOAT(OFS_PARM1) = sb_showscores;
+       prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_DrawHud), "QC function CSQC_DrawHud is missing");
+
+       if (PRVM_clientfunction(CSQC_DrawScores))
+       {
+               VectorSet(PRVM_G_VECTOR(OFS_PARM0), vid_conwidth.integer, vid_conheight.integer, 0);
+               PRVM_G_FLOAT(OFS_PARM1) = sb_showscores;
+               if (key_dest != key_menu)
+                       prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_DrawScores), "QC function CSQC_DrawScores is missing");
+       }
+       else if (sb_showscores || (cl.stats[STAT_HEALTH] <= 0 && cl_deathscoreboard.integer))
+               if (!cl.islocalgame) // LadyHavoc: changed to draw the deathmatch overlays in any multiplayer mode
+                       Sbar_DeathmatchOverlay ();
+
+       R_TimeReport("DrawHud");
+}
+
+
 qbool CL_VM_ConsoleCommand(const char *text, size_t textlen)
 {
        prvm_prog_t *prog = CLVM_prog;
-       return PRVM_ConsoleCommand(prog, text, textlen, &prog->funcoffsets.CSQC_ConsoleCommand, false, cl.csqc_server2csqcentitynumber[cl.playerentity], cl.time, cl.csqc_loaded, "QC function CSQC_ConsoleCommand is missing");
+       return PRVM_ConsoleCommand(prog, text, textlen, &prog->funcoffsets.CSQC_ConsoleCommand, false, cl.csqc_server2csqcentitynumber[cl.playerentity], cl.time, "QC function CSQC_ConsoleCommand is missing");
 }
 
 qbool CL_VM_Parse_TempEntity (void)
 {
        prvm_prog_t *prog = CLVM_prog;
-       int                     t;
-       qbool   r = false;
-       if(!cl.csqc_loaded)
+       int t;
+       qbool r = false;
+
+       if(!prog->loaded)
                return false;
-       CSQC_BEGIN
+
        if(PRVM_clientfunction(CSQC_Parse_TempEntity))
        {
                t = cl_message.readcount;
@@ -556,7 +590,6 @@ qbool CL_VM_Parse_TempEntity (void)
                        cl_message.badread = false;
                }
        }
-       CSQC_END
        return r;
 }
 
@@ -564,6 +597,7 @@ void CL_VM_Parse_StuffCmd(const char *msg, size_t msg_len)
 {
        prvm_prog_t *prog = CLVM_prog;
        int restorevm_tempstringsbuf_cursize;
+
        if(msg[0] == 'c')
        if(msg[1] == 's')
        if(msg[2] == 'q')
@@ -580,12 +614,12 @@ void CL_VM_Parse_StuffCmd(const char *msg, size_t msg_len)
                return;
        }
 
-       if(!cl.csqc_loaded)
+       if(!prog->loaded)
        {
                Cbuf_AddText(cmd_local, msg);
                return;
        }
-       CSQC_BEGIN
+
        if(PRVM_clientfunction(CSQC_Parse_StuffCmd))
        {
                PRVM_clientglobalfloat(time) = cl.time;
@@ -597,7 +631,6 @@ void CL_VM_Parse_StuffCmd(const char *msg, size_t msg_len)
        }
        else
                Cbuf_AddText(cmd_local, msg);
-       CSQC_END
 }
 
 static void CL_VM_Parse_Print(const char *msg, size_t msg_len)
@@ -618,8 +651,7 @@ void CSQC_AddPrintText(const char *msg, size_t msg_len)
        char *start = cl.csqc_printtextbuf + cl.csqc_printtextbuf_len;
        size_t writebytes = min(msg_len + 1, MAX_INPUTLINE - cl.csqc_printtextbuf_len);
 
-       CSQC_BEGIN
-       if(cl.csqc_loaded && PRVM_clientfunction(CSQC_Parse_Print))
+       if(prog->loaded && PRVM_clientfunction(CSQC_Parse_Print))
        {
                if(msg[msg_len - 1] != '\n' && msg[msg_len - 1] != '\r')
                {
@@ -644,15 +676,14 @@ void CSQC_AddPrintText(const char *msg, size_t msg_len)
        }
        else
                Con_Print(msg);
-       CSQC_END
 }
 
 void CL_VM_Parse_CenterPrint(const char *msg, size_t msg_len)
 {
        prvm_prog_t *prog = CLVM_prog;
        int restorevm_tempstringsbuf_cursize;
-       CSQC_BEGIN
-       if(cl.csqc_loaded && PRVM_clientfunction(CSQC_Parse_CenterPrint))
+
+       if(prog->loaded && PRVM_clientfunction(CSQC_Parse_CenterPrint))
        {
                PRVM_clientglobalfloat(time) = cl.time;
                PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity];
@@ -663,36 +694,29 @@ void CL_VM_Parse_CenterPrint(const char *msg, size_t msg_len)
        }
        else
                SCR_CenterPrint(msg);
-       CSQC_END
 }
 
 void CL_VM_UpdateIntermissionState (int intermission)
 {
        prvm_prog_t *prog = CLVM_prog;
-       if(cl.csqc_loaded)
-       {
-               CSQC_BEGIN
+
+       if(prog->loaded)
                PRVM_clientglobalfloat(intermission) = intermission;
-               CSQC_END
-       }
 }
 void CL_VM_UpdateShowingScoresState (int showingscores)
 {
        prvm_prog_t *prog = CLVM_prog;
-       if(cl.csqc_loaded)
-       {
-               CSQC_BEGIN
+
+       if(prog->loaded)
                PRVM_clientglobalfloat(sb_showscores) = showingscores;
-               CSQC_END
-       }
 }
 qbool CL_VM_Event_Sound(int sound_num, float fvolume, int channel, float attenuation, int ent, vec3_t pos, int flags, float speed)
 {
        prvm_prog_t *prog = CLVM_prog;
        qbool r = false;
-       if(cl.csqc_loaded)
+
+       if(prog->loaded)
        {
-               CSQC_BEGIN
                if(PRVM_clientfunction(CSQC_Event_Sound))
                {
                        PRVM_clientglobalfloat(time) = cl.time;
@@ -708,7 +732,6 @@ qbool CL_VM_Event_Sound(int sound_num, float fvolume, int channel, float attenua
                        prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Event_Sound), "QC function CSQC_Event_Sound is missing");
                        r = CSQC_RETURNVAL != 0;
                }
-               CSQC_END
        }
 
        return r;
@@ -720,15 +743,14 @@ static void CL_VM_UpdateCoopDeathmatchGlobals (int gametype)
        int localcoop;
        int localdeathmatch;
 
-       if(cl.csqc_loaded)
+       if(prog->loaded)
        {
                if(gametype == GAME_COOP)
                {
                        localcoop = 1;
                        localdeathmatch = 0;
                }
-               else
-               if(gametype == GAME_DEATHMATCH)
+               else if(gametype == GAME_DEATHMATCH)
                {
                        localcoop = 0;
                        localdeathmatch = 1;
@@ -740,10 +762,8 @@ static void CL_VM_UpdateCoopDeathmatchGlobals (int gametype)
                        localcoop = 0;
                        localdeathmatch = 0;
                }
-               CSQC_BEGIN
                PRVM_clientglobalfloat(coop) = localcoop;
                PRVM_clientglobalfloat(deathmatch) = localdeathmatch;
-               CSQC_END
        }
 }
 #if 0
@@ -751,9 +771,10 @@ static float CL_VM_Event (float event)             //[515]: needed ? I'd say "YES", but don
 {
        prvm_prog_t *prog = CLVM_prog;
        float r = 0;
-       if(!cl.csqc_loaded)
+
+       if(!prog->loaded)
                return 0;
-       CSQC_BEGIN
+
        if(PRVM_clientfunction(CSQC_Event))
        {
                PRVM_clientglobalfloat(time) = cl.time;
@@ -762,7 +783,6 @@ static float CL_VM_Event (float event)              //[515]: needed ? I'd say "YES", but don
                prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Event), "QC function CSQC_Event is missing");
                r = CSQC_RETURNVAL;
        }
-       CSQC_END
        return r;
 }
 #endif
@@ -771,70 +791,69 @@ void CSQC_ReadEntities (void)
 {
        prvm_prog_t *prog = CLVM_prog;
        unsigned short entnum, oldself, realentnum;
-       if(!cl.csqc_loaded)
+
+       if(!prog->loaded)
        {
                Host_Error ("CSQC_ReadEntities: CSQC is not loaded");
                return;
        }
 
-       CSQC_BEGIN
-               PRVM_clientglobalfloat(time) = cl.time;
-               oldself = PRVM_clientglobaledict(self);
-               while(1)
+       PRVM_clientglobalfloat(time) = cl.time;
+       oldself = PRVM_clientglobaledict(self);
+       while(1)
+       {
+               entnum = MSG_ReadShort(&cl_message);
+               if(!entnum || cl_message.badread)
+                       break;
+               realentnum = entnum & 0x7FFF;
+               PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[realentnum];
+               if(entnum & 0x8000)
                {
-                       entnum = MSG_ReadShort(&cl_message);
-                       if(!entnum || cl_message.badread)
-                               break;
-                       realentnum = entnum & 0x7FFF;
-                       PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[realentnum];
-                       if(entnum & 0x8000)
+                       if(PRVM_clientglobaledict(self))
                        {
-                               if(PRVM_clientglobaledict(self))
-                               {
-                                       prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Ent_Remove), "QC function CSQC_Ent_Remove is missing");
-                                       cl.csqc_server2csqcentitynumber[realentnum] = 0;
-                               }
-                               else
-                               {
-                                       // LadyHavoc: removing an entity that is already gone on
-                                       // the csqc side is possible for legitimate reasons (such
-                                       // as a repeat of the remove message), so no warning is
-                                       // needed
-                                       //Con_Printf("Bad csqc_server2csqcentitynumber map\n"); //[515]: never happens ?
-                               }
+                               prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Ent_Remove), "QC function CSQC_Ent_Remove is missing");
+                               cl.csqc_server2csqcentitynumber[realentnum] = 0;
                        }
                        else
                        {
-                               if(!PRVM_clientglobaledict(self))
+                               // LadyHavoc: removing an entity that is already gone on
+                               // the csqc side is possible for legitimate reasons (such
+                               // as a repeat of the remove message), so no warning is
+                               // needed
+                               //Con_Printf("Bad csqc_server2csqcentitynumber map\n"); //[515]: never happens ?
+                       }
+               }
+               else
+               {
+                       if(!PRVM_clientglobaledict(self))
+                       {
+                               if(!PRVM_clientfunction(CSQC_Ent_Spawn))
                                {
-                                       if(!PRVM_clientfunction(CSQC_Ent_Spawn))
-                                       {
-                                               prvm_edict_t    *ed;
-                                               ed = PRVM_ED_Alloc(prog);
-                                               PRVM_clientedictfloat(ed, entnum) = realentnum;
-                                               PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[realentnum] = PRVM_EDICT_TO_PROG(ed);
-                                       }
-                                       else
-                                       {
-                                               // entity( float entnum ) CSQC_Ent_Spawn;
-                                               // the qc function should set entnum, too (this way it also can return world [2/1/2008 Andreas]
-                                               PRVM_G_FLOAT(OFS_PARM0) = (float) realentnum;
-                                               // make sure no one gets wrong ideas
-                                               PRVM_clientglobaledict(self) = 0;
-                                               prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Ent_Spawn), "QC function CSQC_Ent_Spawn is missing");
-                                               PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[realentnum] = PRVM_EDICT( PRVM_G_INT( OFS_RETURN ) );
-                                       }
-                                       PRVM_G_FLOAT(OFS_PARM0) = 1;
-                                       prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Ent_Update), "QC function CSQC_Ent_Update is missing");
+                                       prvm_edict_t    *ed;
+                                       ed = PRVM_ED_Alloc(prog);
+                                       PRVM_clientedictfloat(ed, entnum) = realentnum;
+                                       PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[realentnum] = PRVM_EDICT_TO_PROG(ed);
                                }
-                               else {
-                                       PRVM_G_FLOAT(OFS_PARM0) = 0;
-                                       prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Ent_Update), "QC function CSQC_Ent_Update is missing");
+                               else
+                               {
+                                       // entity( float entnum ) CSQC_Ent_Spawn;
+                                       // the qc function should set entnum, too (this way it also can return world [2/1/2008 Andreas]
+                                       PRVM_G_FLOAT(OFS_PARM0) = (float) realentnum;
+                                       // make sure no one gets wrong ideas
+                                       PRVM_clientglobaledict(self) = 0;
+                                       prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Ent_Spawn), "QC function CSQC_Ent_Spawn is missing");
+                                       PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[realentnum] = PRVM_EDICT( PRVM_G_INT( OFS_RETURN ) );
                                }
+                               PRVM_G_FLOAT(OFS_PARM0) = 1;
+                               prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Ent_Update), "QC function CSQC_Ent_Update is missing");
+                       }
+                       else {
+                               PRVM_G_FLOAT(OFS_PARM0) = 0;
+                               prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Ent_Update), "QC function CSQC_Ent_Update is missing");
                        }
                }
-               PRVM_clientglobaledict(self) = oldself;
-       CSQC_END
+       }
+       PRVM_clientglobaledict(self) = oldself;
 }
 
 static void CLVM_begin_increase_edicts(prvm_prog_t *prog)
@@ -1050,7 +1069,7 @@ void CL_VM_Init (void)
        prog->error_cmd             = Host_Error;
        prog->ExecuteProgram        = CLVM_ExecuteProgram;
 
-       PRVM_Prog_Load(prog, csprogsfn, csprogsdata, csprogsdatasize, cl_numrequiredfunc, cl_required_func, CL_REQFIELDS, cl_reqfields, CL_REQGLOBALS, cl_reqglobals);
+       PRVM_Prog_Load(prog, csprogsfn, csprogsdata, csprogsdatasize, CL_CheckRequiredFuncs, CL_REQFIELDS, cl_reqfields, CL_REQGLOBALS, cl_reqglobals);
 
        if (!prog->loaded)
        {
@@ -1100,15 +1119,22 @@ void CL_VM_Init (void)
        VectorCopy(cl.world.maxs, PRVM_clientedictvector(prog->edicts, maxs));
        VectorCopy(cl.world.mins, PRVM_clientedictvector(prog->edicts, absmin));
        VectorCopy(cl.world.maxs, PRVM_clientedictvector(prog->edicts, absmax));
+       PRVM_clientedictfloat(prog->edicts, solid) = SOLID_BSP;
+       PRVM_clientedictfloat(prog->edicts, modelindex) = 1;
+       PRVM_clientedictstring(prog->edicts, model) = PRVM_SetEngineString(prog, cl.worldmodel->name);
 
-       // call the prog init
-       prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Init), "QC function CSQC_Init is missing");
+       // call the prog init if it exists
+       if (PRVM_clientfunction(CSQC_Init))
+       {
+               PRVM_G_FLOAT(OFS_PARM0) = 1.0f; // CSQC_SIMPLE engines always pass 0, FTE always passes 1
+               PRVM_G_INT(OFS_PARM1) = PRVM_SetEngineString(prog, gamename);
+               PRVM_G_FLOAT(OFS_PARM2) = 1.0f; // TODO DP versions...
+               prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Init), "QC function CSQC_Init is missing");
+       }
 
        // Once CSQC_Init was called, we consider csqc code fully initialized.
        prog->inittime = host.realtime;
 
-       cl.csqc_loaded = true;
-
        cl.csqc_vidvars.drawcrosshair = false;
        cl.csqc_vidvars.drawenginesbar = false;
 
@@ -1120,11 +1146,9 @@ void CL_VM_ShutDown (void)
 {
        prvm_prog_t *prog = CLVM_prog;
        Cmd_ClearCSQCCommands(cmd_local);
+
        //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;
@@ -1133,9 +1157,7 @@ CSQC_BEGIN
                        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;
 }
 
 qbool CL_VM_GetEntitySoundOrigin(int entnum, vec3_t out)
@@ -1146,8 +1168,6 @@ qbool CL_VM_GetEntitySoundOrigin(int entnum, vec3_t out)
        matrix4x4_t matrix;
        qbool r = 0;
 
-       CSQC_BEGIN;
-
        ed = PRVM_EDICT_NUM(entnum - MAX_EDICTS);
 
        if(!ed->free)
@@ -1161,8 +1181,6 @@ qbool CL_VM_GetEntitySoundOrigin(int entnum, vec3_t out)
                r = 1;
        }
 
-       CSQC_END;
-
        return r;
 }
 
@@ -1174,38 +1192,36 @@ qbool CL_VM_TransformView(int entnum, matrix4x4_t *viewmatrix, mplane_t *clippla
        vec3_t forward, left, up, origin, ang;
        matrix4x4_t mat, matq;
 
-       CSQC_BEGIN
-               ed = PRVM_EDICT_NUM(entnum);
-               // camera:
-               //   camera_transform
-               if(PRVM_clientedictfunction(ed, camera_transform))
+       ed = PRVM_EDICT_NUM(entnum);
+       // camera:
+       //   camera_transform
+       if(PRVM_clientedictfunction(ed, camera_transform))
+       {
+               ret = true;
+               if(viewmatrix && clipplane && visorigin)
                {
-                       ret = true;
-                       if(viewmatrix && clipplane && visorigin)
-                       {
-                               Matrix4x4_ToVectors(viewmatrix, forward, left, up, origin);
-                               AnglesFromVectors(ang, forward, up, false);
-                               PRVM_clientglobalfloat(time) = cl.time;
-                               PRVM_clientglobaledict(self) = entnum;
-                               VectorCopy(origin, PRVM_G_VECTOR(OFS_PARM0));
-                               VectorCopy(ang, PRVM_G_VECTOR(OFS_PARM1));
-                               VectorCopy(forward, PRVM_clientglobalvector(v_forward));
-                               VectorScale(left, -1, PRVM_clientglobalvector(v_right));
-                               VectorCopy(up, PRVM_clientglobalvector(v_up));
-                               VectorCopy(origin, PRVM_clientglobalvector(trace_endpos));
-                               prog->ExecuteProgram(prog, PRVM_clientedictfunction(ed, camera_transform), "QC function e.camera_transform is missing");
-                               VectorCopy(PRVM_G_VECTOR(OFS_RETURN), origin);
-                               VectorCopy(PRVM_clientglobalvector(v_forward), forward);
-                               VectorScale(PRVM_clientglobalvector(v_right), -1, left);
-                               VectorCopy(PRVM_clientglobalvector(v_up), up);
-                               VectorCopy(PRVM_clientglobalvector(trace_endpos), visorigin);
-                               Matrix4x4_Invert_Full(&mat, viewmatrix);
-                               Matrix4x4_FromVectors(viewmatrix, forward, left, up, origin);
-                               Matrix4x4_Concat(&matq, viewmatrix, &mat);
-                               Matrix4x4_TransformPositivePlane(&matq, clipplane->normal[0], clipplane->normal[1], clipplane->normal[2], clipplane->dist, clipplane->normal_and_dist);
-                       }
+                       Matrix4x4_ToVectors(viewmatrix, forward, left, up, origin);
+                       AnglesFromVectors(ang, forward, up, false);
+                       PRVM_clientglobalfloat(time) = cl.time;
+                       PRVM_clientglobaledict(self) = entnum;
+                       VectorCopy(origin, PRVM_G_VECTOR(OFS_PARM0));
+                       VectorCopy(ang, PRVM_G_VECTOR(OFS_PARM1));
+                       VectorCopy(forward, PRVM_clientglobalvector(v_forward));
+                       VectorScale(left, -1, PRVM_clientglobalvector(v_right));
+                       VectorCopy(up, PRVM_clientglobalvector(v_up));
+                       VectorCopy(origin, PRVM_clientglobalvector(trace_endpos));
+                       prog->ExecuteProgram(prog, PRVM_clientedictfunction(ed, camera_transform), "QC function e.camera_transform is missing");
+                       VectorCopy(PRVM_G_VECTOR(OFS_RETURN), origin);
+                       VectorCopy(PRVM_clientglobalvector(v_forward), forward);
+                       VectorScale(PRVM_clientglobalvector(v_right), -1, left);
+                       VectorCopy(PRVM_clientglobalvector(v_up), up);
+                       VectorCopy(PRVM_clientglobalvector(trace_endpos), visorigin);
+                       Matrix4x4_Invert_Full(&mat, viewmatrix);
+                       Matrix4x4_FromVectors(viewmatrix, forward, left, up, origin);
+                       Matrix4x4_Concat(&matq, viewmatrix, &mat);
+                       Matrix4x4_TransformPositivePlane(&matq, clipplane->normal[0], clipplane->normal[1], clipplane->normal[2], clipplane->dist, clipplane->normal_and_dist);
                }
-       CSQC_END
+       }
 
        return ret;
 }