]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - csprogs.c
reworked PRVM_EDICTFIELD* and PRVM_GLOBALFIELD* usage to have more
[xonotic/darkplaces.git] / csprogs.c
index a30dd109d3ffe7bf8e6e139b0a579d97d9f7b7c4..7dd08c49996a44ee55c7952638e3dc5e4169378f 100644 (file)
--- a/csprogs.c
+++ b/csprogs.c
@@ -19,18 +19,16 @@ static prvm_prog_t *csqc_tmpprog;
 
 void CL_VM_PreventInformationLeaks(void)
 {
-       prvm_eval_t *val;
        if(!cl.csqc_loaded)
                return;
        CSQC_BEGIN
                VM_ClearTraceGlobals();
-               if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_networkentity)))
-                       val->_float = 0;
+               PRVM_clientglobalfloat(trace_networkentity) = 0;
        CSQC_END
 }
 
 //[515]: these are required funcs
-static char *cl_required_func[] =
+static const char *cl_required_func[] =
 {
        "CSQC_Init",
        "CSQC_InputEvent",
@@ -40,6 +38,146 @@ static char *cl_required_func[] =
 
 static int cl_numrequiredfunc = sizeof(cl_required_func) / sizeof(char*);
 
+#define CL_REQFIELDS (sizeof(cl_reqfields) / sizeof(prvm_required_field_t))
+
+prvm_required_field_t cl_reqfields[] =
+{
+       {ev_entity, "aiment"}, // client field
+       {ev_entity, "enemy"}, // client field
+       {ev_entity, "groundentity"}, // client field
+       {ev_entity, "tag_entity"}, // client field
+       {ev_float, "alpha"}, // client field
+       {ev_float, "bouncefactor"}, // client field
+       {ev_float, "bouncestop"}, // client field
+       {ev_float, "dphitcontentsmask"}, // client field
+       {ev_float, "frame1time"}, // client field
+       {ev_float, "frame2time"}, // client field
+       {ev_float, "frame2"}, // client field
+       {ev_float, "frame3time"}, // client field
+       {ev_float, "frame3"}, // client field
+       {ev_float, "frame4time"}, // client field
+       {ev_float, "frame4"}, // client field
+       {ev_float, "frame"}, // client field
+       {ev_float, "gravity"}, // client field
+       {ev_float, "gravity"}, // client field
+       {ev_float, "ideal_yaw"}, // client field
+       {ev_float, "idealpitch"}, // client field
+       {ev_float, "jointtype"}, // client field
+       {ev_float, "lerpfrac3"}, // client field
+       {ev_float, "lerpfrac4"}, // client field
+       {ev_float, "lerpfrac"}, // client field
+       {ev_float, "mass"}, // client field
+       {ev_float, "modelindex"}, // client field
+       {ev_float, "movetype"}, // client field
+       {ev_float, "pitch_speed"}, // client field
+       {ev_float, "renderflags"}, // client field
+       {ev_float, "scale"}, // client field
+       {ev_float, "scale"}, // client field
+       {ev_float, "shadertime"}, // client field
+       {ev_float, "skeletonindex"}, // client field
+       {ev_float, "solid"}, // client field
+       {ev_float, "tag_index"}, // client field
+       {ev_float, "userwavefunc_param0"}, // client field
+       {ev_float, "userwavefunc_param1"}, // client field
+       {ev_float, "userwavefunc_param2"}, // client field
+       {ev_float, "userwavefunc_param3"}, // client field
+       {ev_float, "yaw_speed"}, // client field
+       {ev_function, "camera_transform"}, // client field
+       {ev_string, "classname"}, // client field
+       {ev_string, "message"}, // client field
+       {ev_vector, "angles"}, // client field
+       {ev_vector, "avelocity"}, // client field
+       {ev_vector, "colormod"}, // client field
+       {ev_vector, "glowmod"}, // client field
+       {ev_vector, "maxs"}, // client field
+       {ev_vector, "mins"}, // client field
+       {ev_vector, "movedir"}, // client field
+       {ev_vector, "origin"}, // client field
+       {ev_vector, "velocity"}, // client field
+};
+
+#define CL_REQGLOBALS (sizeof(cl_reqglobals) / sizeof(prvm_required_field_t))
+
+prvm_required_field_t cl_reqglobals[] =
+{
+       {ev_entity, "self"}, // client global
+       {ev_entity, "trace_ent"}, // client global
+       {ev_float, "coop"}, // client global
+       {ev_float, "deathmatch"}, // client global
+       {ev_float, "dmg_save"}, // client global
+       {ev_float, "dmg_take"}, // client global
+       {ev_float, "drawfont"}, // client global
+       {ev_float, "gettaginfo_parent"}, // client global
+       {ev_float, "intermission"}, // client global
+       {ev_float, "particle_airfriction"}, // client global
+       {ev_float, "particle_alpha"}, // client global
+       {ev_float, "particle_alphafade"}, // client global
+       {ev_float, "particle_angle"}, // client global
+       {ev_float, "particle_blendmode"}, // client global
+       {ev_float, "particle_bounce"}, // client global
+       {ev_float, "particle_delaycollision"}, // client global
+       {ev_float, "particle_delayspawn"}, // client global
+       {ev_float, "particle_gravity"}, // client global
+       {ev_float, "particle_liquidfriction"}, // client global
+       {ev_float, "particle_orientation"}, // client global
+       {ev_float, "particle_originjitter"}, // client global
+       {ev_float, "particle_qualityreduction"}, // client global
+       {ev_float, "particle_size"}, // client global
+       {ev_float, "particle_sizeincrease"}, // client global
+       {ev_float, "particle_spin"}, // client global
+       {ev_float, "particle_stainalpha"}, // client global
+       {ev_float, "particle_stainsize"}, // client global
+       {ev_float, "particle_staintex"}, // client global
+       {ev_float, "particle_staintex"}, // client global
+       {ev_float, "particle_stretch"}, // client global
+       {ev_float, "particle_tex"}, // client global
+       {ev_float, "particle_time"}, // client global
+       {ev_float, "particle_type"}, // client global
+       {ev_float, "particle_velocityjitter"}, // client global
+       {ev_float, "particles_alphamax"}, // client global
+       {ev_float, "particles_alphamin"}, // client global
+       {ev_float, "require_spawnfunc_prefix"}, // client global
+       {ev_float, "sb_showscores"}, // client global
+       {ev_float, "serverdeltatime"}, // client global
+       {ev_float, "serverprevtime"}, // client global
+       {ev_float, "servertime"}, // client global
+       {ev_float, "trace_allsolid"}, // client global
+       {ev_float, "trace_dphitcontents"}, // client global
+       {ev_float, "trace_dphitq3surfaceflags"}, // client global
+       {ev_float, "trace_dpstartcontents"}, // client global
+       {ev_float, "trace_fraction"}, // client global
+       {ev_float, "trace_inopen"}, // client global
+       {ev_float, "trace_inwater"}, // client global
+       {ev_float, "trace_networkentity"}, // client global
+       {ev_float, "trace_plane_dist"}, // client global
+       {ev_float, "trace_startsolid"}, // client global
+       {ev_float, "transparent_offset"}, // client global
+       {ev_string, "gettaginfo_name"}, // client global
+       {ev_string, "trace_dphittexturename"}, // client global
+       {ev_vector, "dmg_origin"}, // client global
+       {ev_vector, "drawfontscale"}, // client global
+       {ev_vector, "gettaginfo_forward"}, // client global
+       {ev_vector, "gettaginfo_offset"}, // client global
+       {ev_vector, "gettaginfo_right"}, // client global
+       {ev_vector, "gettaginfo_up"}, // client global
+       {ev_vector, "particle_color1"}, // client global
+       {ev_vector, "particle_color2"}, // client global
+       {ev_vector, "particle_staincolor1"}, // client global
+       {ev_vector, "particle_staincolor2"}, // client global
+       {ev_vector, "particles_colormax"}, // client global
+       {ev_vector, "particles_colormin"}, // client global
+       {ev_vector, "pmove_inwater"}, // client global
+       {ev_vector, "pmove_onground"}, // client global
+       {ev_vector, "trace_endpos"}, // client global
+       {ev_vector, "trace_plane_normal"}, // client global
+       {ev_vector, "v_forward"}, // client global
+       {ev_vector, "v_right"}, // client global
+       {ev_vector, "v_up"}, // client global
+       {ev_vector, "view_angles"}, // client global
+       {ev_vector, "view_punchangle"}, // client global
+       {ev_vector, "view_punchvector"}, // client global
+};
+
 void CL_VM_Error (const char *format, ...) DP_FUNC_PRINTF(1);
 void CL_VM_Error (const char *format, ...)     //[515]: hope it will be never executed =)
 {
@@ -62,67 +200,53 @@ void CL_VM_Error (const char *format, ...) //[515]: hope it will be never execut
 }
 void CL_VM_UpdateDmgGlobals (int dmg_take, int dmg_save, vec3_t dmg_origin)
 {
-       prvm_eval_t *val;
        if(cl.csqc_loaded)
        {
                CSQC_BEGIN
-               val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.dmg_take);
-               if(val)
-                       val->_float = dmg_take;
-               val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.dmg_save);
-               if(val)
-                       val->_float = dmg_save;
-               val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.dmg_origin);
-               if(val)
-               {
-                       val->vector[0] = dmg_origin[0];
-                       val->vector[1] = dmg_origin[1];
-                       val->vector[2] = dmg_origin[2];
-               }
+               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_eval_t *val;
        if(!cl.csqc_loaded)
                return;
        CSQC_BEGIN
-       if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.servertime)))
-               val->_float = newtime;
-       if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.serverprevtime)))
-               val->_float = oldtime;
-       if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.serverdeltatime)))
-               val->_float = newtime - oldtime;
+       PRVM_clientglobalfloat(servertime) = newtime;
+       PRVM_clientglobalfloat(serverprevtime) = oldtime;
+       PRVM_clientglobalfloat(serverdeltatime) = newtime - oldtime;
        CSQC_END
 }
 
 //[515]: set globals before calling R_UpdateView, WEIRD CRAP
 static void CSQC_SetGlobals (void)
 {
-       prvm_eval_t *val;
        CSQC_BEGIN
                prog->globals.client->time = cl.time;
                prog->globals.client->frametime = max(0, cl.time - cl.oldtime);
                prog->globals.client->servercommandframe = cls.servermovesequence;
                prog->globals.client->clientcommandframe = cl.movecmd[0].sequence;
                VectorCopy(cl.viewangles, prog->globals.client->input_angles);
-               VectorCopy(cl.viewangles, cl.csqc_angles);
                // // FIXME: this actually belongs into getinputstate().. [12/17/2007 Black]
                prog->globals.client->input_buttons = cl.movecmd[0].buttons;
                VectorSet(prog->globals.client->input_movevalues, cl.movecmd[0].forwardmove, cl.movecmd[0].sidemove, cl.movecmd[0].upmove);
-               //VectorCopy(cl.movement_origin, cl.csqc_origin);
-               Matrix4x4_OriginFromMatrix(&cl.entities[cl.viewentity].render.matrix, cl.csqc_origin);
+               VectorCopy(cl.csqc_vieworiginfromengine, cl.csqc_vieworigin);
+               VectorCopy(cl.csqc_viewanglesfromengine, cl.csqc_viewangles);
 
                // LordHavoc: 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
-               VectorCopy(cl.csqc_origin, prog->globals.client->pmove_org);
+               Matrix4x4_OriginFromMatrix(&cl.entities[cl.viewentity].render.matrix, prog->globals.client->pmove_org);
                VectorCopy(cl.movement_velocity, prog->globals.client->pmove_vel);
+               PRVM_clientglobalfloat(pmove_onground) = cl.onground;
+               PRVM_clientglobalfloat(pmove_inwater) = cl.inwater;
 
-               if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.view_angles)))
-                       VectorCopy(cl.viewangles, val->vector);
+               VectorCopy(cl.viewangles, PRVM_clientglobalvector(view_angles));
+               VectorCopy(cl.punchangle, PRVM_clientglobalvector(view_punchangle));
+               VectorCopy(cl.punchvector, PRVM_clientglobalvector(view_punchvector));
                prog->globals.client->maxclients = cl.maxclients;
        CSQC_END
 }
@@ -159,10 +283,8 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed, int edictnum)
        int renderflags;
        int c;
        float scale;
-       prvm_eval_t *val;
        entity_render_t *entrender;
        dp_model_t *model;
-       matrix4x4_t tagmatrix, matrix2;
 
        model = CL_GetModelFromEdict(ed);
        if (!model)
@@ -174,8 +296,9 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed, int edictnum)
                        return false;
                entrender = cl.csqcrenderentities + edictnum;
                r_refdef.scene.entities[r_refdef.scene.numentities++] = entrender;
-               entrender->entitynumber = edictnum;
+               entrender->entitynumber = edictnum + MAX_EDICTS;
                //entrender->shadertime = 0; // shadertime was set by spawn()
+               entrender->flags = 0;
                entrender->alpha = 1;
                entrender->scale = 1;
                VectorSet(entrender->colormod, 1, 1, 1);
@@ -189,64 +312,41 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed, int edictnum)
                        return false;
        }
 
+       entrender->userwavefunc_param[0] = PRVM_clientedictfloat(ed, userwavefunc_param0);
+       entrender->userwavefunc_param[1] = PRVM_clientedictfloat(ed, userwavefunc_param1);
+       entrender->userwavefunc_param[2] = PRVM_clientedictfloat(ed, userwavefunc_param2);
+       entrender->userwavefunc_param[3] = PRVM_clientedictfloat(ed, userwavefunc_param3);
+
        entrender->model = model;
        entrender->skinnum = (int)ed->fields.client->skin;
        entrender->effects |= entrender->model->effects;
-       scale = 1;
-       renderflags = 0;
-       if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.renderflags)) && val->_float)     renderflags = (int)val->_float;
-       if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.alpha)) && val->_float)           entrender->alpha = val->_float;
-       if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.scale)) && val->_float)           entrender->scale = scale = val->_float;
-       if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.colormod)) && VectorLength2(val->vector)) VectorCopy(val->vector, entrender->colormod);
-       if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.glowmod)) && VectorLength2(val->vector))  VectorCopy(val->vector, entrender->glowmod);
-       if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.effects)) && val->_float) entrender->effects |= (int)val->_float;
-       if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.tag_entity)) && val->edict)
-       {
-               int tagentity;
-               int tagindex = 0;
-               tagentity = val->edict;
-               if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.tag_index)) && val->_float)
-                       tagindex = (int)val->_float;
-               CL_GetTagMatrix (&tagmatrix, PRVM_PROG_TO_EDICT(tagentity), tagindex);
-       }
-       else
-               Matrix4x4_CreateIdentity(&tagmatrix);
+       renderflags = (int)PRVM_clientedictfloat(ed, renderflags);
+       entrender->alpha = PRVM_clientedictfloat(ed, alpha);
+       entrender->scale = scale = PRVM_clientedictfloat(ed, scale);
+       VectorCopy(PRVM_clientedictvector(ed, colormod), entrender->colormod);
+       VectorCopy(PRVM_clientedictvector(ed, glowmod), entrender->glowmod);
+       if(ed->fields.client->effects)  entrender->effects |= (int)ed->fields.client->effects;
+       if (!entrender->alpha)
+               entrender->alpha = 1.0f;
+       if (!entrender->scale)
+               entrender->scale = scale = 1.0f;
        if (!VectorLength2(entrender->colormod))
                VectorSet(entrender->colormod, 1, 1, 1);
        if (!VectorLength2(entrender->glowmod))
                VectorSet(entrender->glowmod, 1, 1, 1);
 
-       if (renderflags & RF_USEAXIS)
-       {
-               vec3_t left;
-               VectorNegate(prog->globals.client->v_right, left);
-               Matrix4x4_FromVectors(&matrix2, prog->globals.client->v_forward, left, prog->globals.client->v_up, ed->fields.client->origin);
-               Matrix4x4_Scale(&matrix2, scale, 1);
-       }
-       else
-       {
-               vec3_t angles;
-               VectorCopy(ed->fields.client->angles, angles);
-               // if model is alias, reverse pitch direction
-               if (entrender->model->type == mod_alias)
-                       angles[0] = -angles[0];
-
-               // set up the render matrix
-               Matrix4x4_CreateFromQuakeEntity(&matrix2, ed->fields.client->origin[0], ed->fields.client->origin[1], ed->fields.client->origin[2], angles[0], angles[1], angles[2], scale);
-       }
+       // LordHavoc: use the CL_GetTagMatrix function on self to ensure consistent behavior (duplicate code would be bad)
+       CL_GetTagMatrix(&entrender->matrix, ed, 0);
 
        // set up the animation data
        VM_GenerateFrameGroupBlend(ed->priv.server->framegroupblend, ed);
        VM_FrameBlendFromFrameGroupBlend(ed->priv.server->frameblend, ed->priv.server->framegroupblend, model);
        VM_UpdateEdictSkeleton(ed, model, ed->priv.server->frameblend);
-       if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.shadertime))) entrender->shadertime = val->_float;
-
-       // concat the matrices to make the entity relative to its tag
-       Matrix4x4_Concat(&entrender->matrix, &tagmatrix, &matrix2);
+       entrender->shadertime = PRVM_clientedictfloat(ed, shadertime);
 
        // transparent offset
-       if ((renderflags & RF_USETRANSPARENTOFFSET) && (val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.transparent_offset)))
-               entrender->transparent_offset = val->_float;
+       if (renderflags & RF_USETRANSPARENTOFFSET)
+               entrender->transparent_offset = PRVM_clientglobalfloat(transparent_offset);
 
        if(renderflags)
        {
@@ -255,7 +355,6 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed, int edictnum)
                if(renderflags & RF_NOCULL)             entrender->flags |= RENDER_NOCULL;
                if(renderflags & RF_DEPTHHACK)  entrender->flags |= RENDER_NODEPTHTEST;
                if(renderflags & RF_ADDITIVE)           entrender->flags |= RENDER_ADDITIVE;
-
        }
 
        c = (int)ed->fields.client->colormap;
@@ -270,7 +369,7 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed, int edictnum)
        // either fullbright or lit
        if(!r_fullbright.integer)
        {
-               if (!(entrender->effects & EF_FULLBRIGHT))
+               if (!(entrender->effects & EF_FULLBRIGHT) && !(renderflags & RF_FULLBRIGHT))
                        entrender->flags |= RENDER_LIGHT;
                else if(r_equalize_entities_fullbright.integer)
                        entrender->flags |= RENDER_LIGHT | RENDER_EQUALIZE;
@@ -278,6 +377,7 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed, int edictnum)
        // hide player shadow during intermission or nehahra movie
        if (!(entrender->effects & (EF_NOSHADOW | EF_ADDITIVE | EF_NODEPTHTEST))
         &&  (entrender->alpha >= 1)
+        && !(renderflags & RF_NOSHADOW)
         && !(entrender->flags & RENDER_VIEWMODEL)
         && (!(entrender->flags & RENDER_EXTERIORMODEL) || (!cl.intermission && cls.protocol != PROTOCOL_NEHAHRAMOVIE && !cl_noplayershadow.integer)))
                entrender->flags |= RENDER_SHADOW;
@@ -338,6 +438,7 @@ qboolean CL_VM_UpdateView (void)
 //     vec3_t oldangles;
        if(!cl.csqc_loaded)
                return false;
+       R_TimeReport("pre-UpdateView");
        CSQC_BEGIN
                //VectorCopy(cl.viewangles, oldangles);
                prog->globals.client->time = cl.time;
@@ -355,6 +456,7 @@ qboolean CL_VM_UpdateView (void)
                // Dresk : Reset Dmg Globals Here
                CL_VM_UpdateDmgGlobals(0, 0, emptyvector);
        CSQC_END
+       R_TimeReport("UpdateView");
        return true;
 }
 
@@ -553,25 +655,19 @@ void CL_VM_Parse_CenterPrint (const char *msg)
 
 void CL_VM_UpdateIntermissionState (int intermission)
 {
-       prvm_eval_t *val;
        if(cl.csqc_loaded)
        {
                CSQC_BEGIN
-               val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.intermission);
-               if(val)
-                       val->_float = intermission;
+               PRVM_clientglobalfloat(intermission) = intermission;
                CSQC_END
        }
 }
 void CL_VM_UpdateShowingScoresState (int showingscores)
 {
-       prvm_eval_t *val;
        if(cl.csqc_loaded)
        {
                CSQC_BEGIN
-               val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.sb_showscores);
-               if(val)
-                       val->_float = showingscores;
+               PRVM_clientglobalfloat(sb_showscores) = showingscores;
                CSQC_END
        }
 }
@@ -605,7 +701,6 @@ void CL_VM_UpdateCoopDeathmatchGlobals (int gametype)
        int localcoop;
        int localdeathmatch;
 
-       prvm_eval_t *val;
        if(cl.csqc_loaded)
        {
                if(gametype == GAME_COOP)
@@ -627,12 +722,8 @@ void CL_VM_UpdateCoopDeathmatchGlobals (int gametype)
                        localdeathmatch = 0;
                }
                CSQC_BEGIN
-               val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.coop);
-               if(val)
-                       val->_float = localcoop;
-               val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.deathmatch);
-               if(val)
-                       val->_float = localdeathmatch;
+               PRVM_clientglobalfloat(coop) = localcoop;
+               PRVM_clientglobalfloat(deathmatch) = localdeathmatch;
                CSQC_END
        }
 }
@@ -670,7 +761,7 @@ void CSQC_ReadEntities (void)
                {
                        entnum = MSG_ReadShort();
                        if(!entnum || msg_badread)
-                               return;
+                               break;
                        realentnum = entnum & 0x7FFF;
                        prog->globals.client->self = cl.csqc_server2csqcentitynumber[realentnum];
                        if(entnum & 0x8000)
@@ -735,7 +826,7 @@ void CL_VM_CB_EndIncreaseEdicts(void)
        prvm_edict_t *ent;
 
        // link every entity except world
-       for (i = 1, ent = prog->edicts;i < prog->max_edicts;i++, ent++)
+       for (i = 1, ent = prog->edicts;i < prog->num_edicts;i++, ent++)
                if (!ent->priv.server->free)
                        CL_LinkEdict(ent);
 }
@@ -798,7 +889,7 @@ void Cmd_ClearCsqcFuncs (void);
 
 // returns true if the packet is valid, false if end of file is reached
 // used for dumping the CSQC download into demo files
-qboolean MakeDownloadPacket(const char *filename, unsigned char *data, unsigned long len, int crc, int cnt, sizebuf_t *buf, int protocol)
+qboolean MakeDownloadPacket(const char *filename, unsigned char *data, size_t len, int crc, int cnt, sizebuf_t *buf, int protocol)
 {
        int packetsize = buf->maxsize - 7; // byte short long
        int npackets = (len + packetsize - 1) / (packetsize);
@@ -810,7 +901,7 @@ qboolean MakeDownloadPacket(const char *filename, unsigned char *data, unsigned
        if(cnt == 0)
        {
                MSG_WriteByte(buf, svc_stufftext);
-               MSG_WriteString(buf, va("\ncl_downloadbegin %lu %s\n", len, filename));
+               MSG_WriteString(buf, va("\ncl_downloadbegin %lu %s\n", (unsigned long)len, filename));
                return true;
        }
        else if(cnt >= 1 && cnt <= npackets)
@@ -830,7 +921,7 @@ qboolean MakeDownloadPacket(const char *filename, unsigned char *data, unsigned
        else if(cnt == npackets + 1)
        {
                MSG_WriteByte(buf, svc_stufftext);
-               MSG_WriteString(buf, va("\ncl_downloadfinished %lu %d\n", len, crc));
+               MSG_WriteString(buf, va("\ncl_downloadfinished %lu %d\n", (unsigned long)len, crc));
                return true;
        }
        return false;
@@ -843,7 +934,6 @@ void CL_VM_Init (void)
        fs_offset_t csprogsdatasize;
        int csprogsdatacrc, requiredcrc;
        int requiredsize;
-       prvm_eval_t *val;
 
        // reset csqc_progcrc after reading it, so that changing servers doesn't
        // expect csqc on the next server
@@ -867,7 +957,7 @@ void CL_VM_Init (void)
        }
        if (csprogsdata)
        {
-               csprogsdatacrc = CRC_Block(csprogsdata, csprogsdatasize);
+               csprogsdatacrc = CRC_Block(csprogsdata, (size_t)csprogsdatasize);
                if (csprogsdatacrc != requiredcrc || csprogsdatasize != requiredsize)
                {
                        if (cls.demoplayback)
@@ -928,7 +1018,7 @@ void CL_VM_Init (void)
        prog->error_cmd = CL_VM_Error;
        prog->ExecuteProgram = CLVM_ExecuteProgram;
 
-       PRVM_LoadProgs(csprogsfn, cl_numrequiredfunc, cl_required_func, 0, NULL, 0, NULL);
+       PRVM_LoadProgs(csprogsfn, cl_numrequiredfunc, cl_required_func, CL_REQFIELDS, cl_reqfields, CL_REQGLOBALS, cl_reqglobals);
 
        if (!prog->loaded)
        {
@@ -955,7 +1045,7 @@ void CL_VM_Init (void)
                        i = 0;
 
                        CL_CutDemo(&demobuf, &demofilesize);
-                       while(MakeDownloadPacket(csqc_progname.string, csprogsdata, csprogsdatasize, csprogsdatacrc, i++, &sb, cls.protocol))
+                       while(MakeDownloadPacket(csqc_progname.string, csprogsdata, (size_t)csprogsdatasize, csprogsdatacrc, i++, &sb, cls.protocol))
                                CL_WriteDemoMessage(&sb);
                        CL_PasteDemo(&demobuf, &demofilesize);
 
@@ -973,13 +1063,11 @@ void CL_VM_Init (void)
        prog->globals.client->time = cl.time;
        prog->globals.client->self = 0;
 
-       prog->globals.client->mapname = cl.worldmodel ? PRVM_SetEngineString(cl.worldmodel->name) : PRVM_SetEngineString("");
+       prog->globals.client->mapname = PRVM_SetEngineString(cl.worldname);
        prog->globals.client->player_localentnum = cl.playerentity;
 
        // set map description (use world entity 0)
-       val = PRVM_EDICTFIELDVALUE(prog->edicts, prog->fieldoffsets.message);
-       if(val)
-               val->string = PRVM_SetEngineString(cl.levelname);
+       PRVM_clientedictstring(prog->edicts, message) = PRVM_SetEngineString(cl.worldmessage);
        VectorCopy(cl.world.mins, prog->edicts->fields.client->mins);
        VectorCopy(cl.world.maxs, prog->edicts->fields.client->maxs);
 
@@ -1042,3 +1130,46 @@ qboolean CL_VM_GetEntitySoundOrigin(int entnum, vec3_t out)
 
        return r;
 }
+
+qboolean CL_VM_TransformView(int entnum, matrix4x4_t *viewmatrix, mplane_t *clipplane, vec3_t visorigin)
+{
+       qboolean ret = false;
+       prvm_edict_t *ed;
+       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))
+               {
+                       ret = true;
+                       if(viewmatrix || clipplane || visorigin)
+                       {
+                               Matrix4x4_ToVectors(viewmatrix, forward, left, up, origin);
+                               AnglesFromVectors(ang, forward, up, false);
+                               prog->globals.client->time = cl.time;
+                               prog->globals.client->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));
+                               PRVM_ExecuteProgram(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[0]);
+                       }
+               }
+       CSQC_END
+
+       return ret;
+}