]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - pr_cmds.c
changed brush model API - now uses function pointers for some of the brush model...
[xonotic/darkplaces.git] / pr_cmds.c
index 91e435b5eb930fb47e5f3122ab71ade3da532a79..425582088154a0633f0cf7a0f23f1bfc2bceb438 100644 (file)
--- a/pr_cmds.c
+++ b/pr_cmds.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -20,6 +20,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
+cvar_t sv_aim = {CVAR_SAVE, "sv_aim", "2"}; //"0.93"}; // LordHavoc: disabled autoaim by default
+cvar_t pr_zone_min_strings = {0, "pr_zone_min_strings", "64"};
+
+mempool_t *pr_strings_mempool;
+
+#define MAX_VARSTRING 4096
+
+char pr_varstring_temp[MAX_VARSTRING];
+
 #define        RETURN_EDICT(e) (((int *)pr_globals)[OFS_RETURN] = EDICT_TO_PROG(e))
 
 
@@ -31,75 +40,119 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 ===============================================================================
 */
 
+
 char *PF_VarString (int        first)
 {
-       int             i;
-       static char out[256];
-       
-       out[0] = 0;
-       for (i=first ; i<pr_argc ; i++)
-       {
-               strcat (out, G_STRING((OFS_PARM0+i*3)));
-       }
-       return out;
-}
-
-char *QSG_EXTENSIONS = "\
-DP_BLOOD \
-DP_BLOODSHOWER \
-DP_CORPSE \
-DP_DRAWONLYTOCLIENT \
-DP_EXPLOSION3 \
-DP_PARTICLECUBE \
-DP_PARTICLERAIN \
-DP_PARTICLESNOW \
-DP_GETLIGHT \
-DP_NODRAWTOCLIENT \
-DP_RANDOMVEC \
-DP_REGISTERCVAR \
-DP_SPARK \
-DP_SPRITE32 \
-DP_MODEL32 \
-DP_TRACEBOX \
-DP_MINMAXBOUND \
-DP_FINDFLOAT \
-NEH_PLAY2 \
-QSG_ALPHA \
-QSG_BUTTONS \
-QSG_CHANGEPITCH \
-QSG_COLORMOD \
-QSG_DELTA \
-QSG_ETOS \
-QSG_FOG \
-QSG_FOLLOW \
-QSG_GLOW \
-QSG_MATH \
-QSG_MONSTERWALK \
-QSG_QUAKE2MODEL \
-QSG_SCALE \
-QSG_SKYBOX \
-QSG_TRACETOSS \
-QSG_VIEWMODEL \
-QSG_COPYENT \
-";
+       int i, j, end;
+       char *s;
+
+       end = 0;
+       for (i = first;i < pr_argc;i++)
+       {
+               // LordHavoc: FIXME: this is just a strlcat inlined
+               s = G_STRING((OFS_PARM0+i*3));
+               j = strlen(s);
+               if (j > MAX_VARSTRING - 1 - end)
+                       j = MAX_VARSTRING - 1 - end;
+               if (j > 0)
+               {
+                       memcpy(pr_varstring_temp + end, s, j);
+                       end += j;
+               }
+       }
+       pr_varstring_temp[end] = 0;
+       return pr_varstring_temp;
+}
+
+char *ENGINE_EXTENSIONS =
+"DP_CL_LOADSKY "
+"DP_EF_NODRAW "
+"DP_EF_ADDITIVE "
+"DP_EF_BLUE "
+"DP_EF_RED "
+"DP_EF_FULLBRIGHT "
+"DP_EF_FLAME "
+"DP_EF_STARDUST "
+"DP_ENT_ALPHA "
+"DP_ENT_CUSTOMCOLORMAP "
+"DP_ENT_EXTERIORMODELTOCLIENT "
+"DP_ENT_LOWPRECISION "
+"DP_ENT_GLOW "
+"DP_ENT_SCALE "
+"DP_ENT_VIEWMODEL "
+"DP_GFX_FOG "
+"DP_GFX_SKYBOX "
+"DP_HALFLIFE_MAP "
+"DP_INPUTBUTTONS "
+"DP_MONSTERWALK "
+"DP_MOVETYPEBOUNCEMISSILE "
+"DP_MOVETYPEFOLLOW "
+"DP_QC_CHANGEPITCH "
+"DP_QC_COPYENTITY "
+"DP_QC_ETOS "
+"DP_QC_FINDCHAIN "
+"DP_QC_FINDCHAINFLOAT "
+"DP_QC_FINDFLOAT "
+"DP_QC_GETLIGHT "
+"DP_QC_GETSURFACE "
+"DP_QC_MINMAXBOUND "
+"DP_QC_RANDOMVEC "
+"DP_QC_SINCOSSQRTPOW "
+"DP_QC_TRACEBOX "
+"DP_QC_TRACETOSS "
+"DP_QC_VECTORVECTORS "
+"DP_QUAKE2_MODEL "
+"DP_QUAKE3_MODEL "
+"DP_REGISTERCVAR "
+"DP_SOLIDCORPSE "
+"DP_SPRITE32 "
+"DP_SV_DRAWONLYTOCLIENT "
+"DP_SV_EFFECT "
+"DP_SV_EXTERIORMODELTOCLIENT "
+"DP_SV_NODRAWTOCLIENT "
+"DP_SV_PLAYERPHYSICS "
+"DP_SV_SETCOLOR "
+"DP_SV_SLOWMO "
+"DP_TE_BLOOD "
+"DP_TE_BLOODSHOWER "
+"DP_TE_CUSTOMFLASH "
+"DP_TE_EXPLOSIONRGB "
+"DP_TE_FLAMEJET "
+"DP_TE_PARTICLECUBE "
+"DP_TE_PARTICLERAIN "
+"DP_TE_PARTICLESNOW "
+"DP_TE_PLASMABURN "
+"DP_TE_QUADEFFECTS1 "
+"DP_TE_SMALLFLASH "
+"DP_TE_SPARK "
+"DP_TE_STANDARDEFFECTBUILTINS "
+"DP_VIEWZOOM "
+"FRIK_FILE "
+"KRIMZON_SV_PARSECLIENTCOMMAND "
+"NEH_CMD_PLAY2 "
+"NEH_RESTOREGAME "
+"TW_SV_STEPCONTROL "
+;
 
 qboolean checkextension(char *name)
 {
        int len;
-       char *e;
+       char *e, *start;
        len = strlen(name);
-       for (e = QSG_EXTENSIONS;*e;e++)
+       for (e = ENGINE_EXTENSIONS;*e;e++)
        {
                while (*e == ' ')
                        e++;
                if (!*e)
                        break;
-               if (!strncasecmp(e, name, len))
-                       return TRUE;
+               start = e;
                while (*e && *e != ' ')
                        e++;
+               if (e - start == len)
+                       if (!strncasecmp(start, name, len))
+                               return true;
        }
-       return FALSE;
+       return false;
 }
 
 /*
@@ -130,10 +183,9 @@ void PF_error (void)
 {
        char    *s;
        edict_t *ed;
-       
+
        s = PF_VarString(0);
-       Con_Printf ("======SERVER ERROR in %s:\n%s\n"
-       ,pr_strings + pr_xfunction->s_name,s);
+       Con_Printf ("======SERVER ERROR in %s:\n%s\n", PR_GetString(pr_xfunction->s_name), s);
        ed = PROG_TO_EDICT(pr_global_struct->self);
        ED_Print (ed);
 
@@ -154,19 +206,15 @@ void PF_objerror (void)
 {
        char    *s;
        edict_t *ed;
-       
+
        s = PF_VarString(0);
-       Con_Printf ("======OBJECT ERROR in %s:\n%s\n"
-       ,pr_strings + pr_xfunction->s_name,s);
+       Con_Printf ("======OBJECT ERROR in %s:\n%s\n", PR_GetString(pr_xfunction->s_name), s);
        ed = PROG_TO_EDICT(pr_global_struct->self);
        ED_Print (ed);
        ED_Free (ed);
-       
-       Host_Error ("Program error");
 }
 
 
-
 /*
 ==============
 PF_makevectors
@@ -180,6 +228,20 @@ void PF_makevectors (void)
        AngleVectors (G_VECTOR(OFS_PARM0), pr_global_struct->v_forward, pr_global_struct->v_right, pr_global_struct->v_up);
 }
 
+/*
+==============
+PF_vectorvectors
+
+Writes new values for v_forward, v_up, and v_right based on the given forward vector
+vectorvectors(vector, vector)
+==============
+*/
+void PF_vectorvectors (void)
+{
+       VectorNormalize2(G_VECTOR(OFS_PARM0), pr_global_struct->v_forward);
+       VectorVectors(pr_global_struct->v_forward, pr_global_struct->v_right, pr_global_struct->v_up);
+}
+
 /*
 =================
 PF_setorigin
@@ -193,85 +255,27 @@ void PF_setorigin (void)
 {
        edict_t *e;
        float   *org;
-       
+
        e = G_EDICT(OFS_PARM0);
        org = G_VECTOR(OFS_PARM1);
-       VectorCopy (org, e->v.origin);
+       VectorCopy (org, e->v->origin);
        SV_LinkEdict (e, false);
 }
 
 
 void SetMinMaxSize (edict_t *e, float *min, float *max, qboolean rotate)
 {
-       float   *angles;
-       vec3_t  rmin, rmax;
-       float   bounds[2][3];
-       float   xvector[2], yvector[2];
-       float   a;
-       vec3_t  base, transformed;
-       int             i, j, k, l;
-       
+       int             i;
+
        for (i=0 ; i<3 ; i++)
                if (min[i] > max[i])
-                       PR_RunError ("backwards mins/maxs");
-
-       rotate = false;         // FIXME: implement rotation properly again
+                       Host_Error ("backwards mins/maxs");
 
-       if (!rotate)
-       {
-               VectorCopy (min, rmin);
-               VectorCopy (max, rmax);
-       }
-       else
-       {
-       // find min / max for rotations
-               angles = e->v.angles;
-               
-               a = angles[1]/180 * M_PI;
-               
-               xvector[0] = cos(a);
-               xvector[1] = sin(a);
-               yvector[0] = -sin(a);
-               yvector[1] = cos(a);
-               
-               VectorCopy (min, bounds[0]);
-               VectorCopy (max, bounds[1]);
-               
-               rmin[0] = rmin[1] = rmin[2] = 9999;
-               rmax[0] = rmax[1] = rmax[2] = -9999;
-               
-               for (i=0 ; i<= 1 ; i++)
-               {
-                       base[0] = bounds[i][0];
-                       for (j=0 ; j<= 1 ; j++)
-                       {
-                               base[1] = bounds[j][1];
-                               for (k=0 ; k<= 1 ; k++)
-                               {
-                                       base[2] = bounds[k][2];
-                                       
-                               // transform the point
-                                       transformed[0] = xvector[0]*base[0] + yvector[0]*base[1];
-                                       transformed[1] = xvector[1]*base[0] + yvector[1]*base[1];
-                                       transformed[2] = base[2];
-                                       
-                                       for (l=0 ; l<3 ; l++)
-                                       {
-                                               if (transformed[l] < rmin[l])
-                                                       rmin[l] = transformed[l];
-                                               if (transformed[l] > rmax[l])
-                                                       rmax[l] = transformed[l];
-                                       }
-                               }
-                       }
-               }
-       }
-       
 // set derived values
-       VectorCopy (rmin, e->v.mins);
-       VectorCopy (rmax, e->v.maxs);
-       VectorSubtract (max, min, e->v.size);
-       
+       VectorCopy (min, e->v->mins);
+       VectorCopy (max, e->v->maxs);
+       VectorSubtract (max, min, e->v->size);
+
        SV_LinkEdict (e, false);
 }
 
@@ -280,6 +284,7 @@ void SetMinMaxSize (edict_t *e, float *min, float *max, qboolean rotate)
 PF_setsize
 
 the size box is rotated by the current angle
+LordHavoc: no it isn't...
 
 setsize (entity, minvector, maxvector)
 =================
@@ -288,7 +293,7 @@ void PF_setsize (void)
 {
        edict_t *e;
        float   *min, *max;
-       
+
        e = G_EDICT(OFS_PARM0);
        min = G_VECTOR(OFS_PARM1);
        max = G_VECTOR(OFS_PARM2);
@@ -317,31 +322,18 @@ void PF_setmodel (void)
        for (i=0, check = sv.model_precache ; *check ; i++, check++)
                if (!strcmp(*check, m))
                        break;
-                       
+
        if (!*check)
-               PR_RunError ("no precache: %s\n", m);
-               
+               Host_Error ("no precache: %s\n", m);
+
+
+       e->v->model = PR_SetString(*check);
+       e->v->modelindex = i;
 
-       e->v.model = m - pr_strings;
-       e->v.modelindex = i; //SV_ModelIndex (m);
+       mod = sv.models[ (int)e->v->modelindex];
 
-       mod = sv.models[ (int)e->v.modelindex];  // Mod_ForName (m, true);
-       
        if (mod)
-       /*
-       { // LordHavoc: corrected model bounding box, but for compatibility that means I have to break it here
-               vec3_t min, max;
-               if (mod->type == ALIASTYPE_MDL)
-               {
-                       min[0] = min[1] = min[2] = -16;
-                       max[0] = max[1] = max[2] = 16;
-                       SetMinMaxSize (e, min, max, true);
-               }
-               else
-                       SetMinMaxSize (e, mod->mins, mod->maxs, true);
-       }
-       */
-               SetMinMaxSize (e, mod->mins, mod->maxs, true);
+               SetMinMaxSize (e, mod->normalmins, mod->normalmaxs, true);
        else
                SetMinMaxSize (e, vec3_origin, vec3_origin, true);
 }
@@ -377,18 +369,18 @@ void PF_sprint (void)
        char            *s;
        client_t        *client;
        int                     entnum;
-       
+
        entnum = G_EDICTNUM(OFS_PARM0);
        s = PF_VarString(1);
-       
+
        if (entnum < 1 || entnum > svs.maxclients)
        {
                Con_Printf ("tried to sprint to a non-client\n");
                return;
        }
-               
+
        client = &svs.clients[entnum-1];
-               
+
        MSG_WriteChar (&client->message,svc_print);
        MSG_WriteString (&client->message, s );
 }
@@ -408,18 +400,18 @@ void PF_centerprint (void)
        char            *s;
        client_t        *client;
        int                     entnum;
-       
+
        entnum = G_EDICTNUM(OFS_PARM0);
        s = PF_VarString(1);
-       
+
        if (entnum < 1 || entnum > svs.maxclients)
        {
                Con_Printf ("tried to sprint to a non-client\n");
                return;
        }
-               
+
        client = &svs.clients[entnum-1];
-               
+
        MSG_WriteChar (&client->message,svc_centerprint);
        MSG_WriteString (&client->message, s );
 }
@@ -437,12 +429,12 @@ void PF_normalize (void)
        float   *value1;
        vec3_t  newvalue;
        float   new;
-       
+
        value1 = G_VECTOR(OFS_PARM0);
 
        new = value1[0] * value1[0] + value1[1] * value1[1] + value1[2]*value1[2];
        new = sqrt(new);
-       
+
        if (new == 0)
                newvalue[0] = newvalue[1] = newvalue[2] = 0;
        else
@@ -452,8 +444,8 @@ void PF_normalize (void)
                newvalue[1] = value1[1] * new;
                newvalue[2] = value1[2] * new;
        }
-       
-       VectorCopy (newvalue, G_VECTOR(OFS_RETURN));    
+
+       VectorCopy (newvalue, G_VECTOR(OFS_RETURN));
 }
 
 /*
@@ -467,12 +459,12 @@ void PF_vlen (void)
 {
        float   *value1;
        float   new;
-       
+
        value1 = G_VECTOR(OFS_PARM0);
 
        new = value1[0] * value1[0] + value1[1] * value1[1] + value1[2]*value1[2];
        new = sqrt(new);
-       
+
        G_FLOAT(OFS_RETURN) = new;
 }
 
@@ -487,7 +479,7 @@ void PF_vectoyaw (void)
 {
        float   *value1;
        float   yaw;
-       
+
        value1 = G_VECTOR(OFS_PARM0);
 
        if (value1[1] == 0 && value1[0] == 0)
@@ -515,7 +507,7 @@ void PF_vectoangles (void)
        float   *value1;
        float   forward;
        float   yaw, pitch;
-       
+
        value1 = G_VECTOR(OFS_PARM0);
 
        if (value1[1] == 0 && value1[0] == 0)
@@ -528,11 +520,19 @@ void PF_vectoangles (void)
        }
        else
        {
-               yaw = (int) (atan2(value1[1], value1[0]) * 180 / M_PI);
-               if (yaw < 0)
-                       yaw += 360;
+               // LordHavoc: optimized a bit
+               if (value1[0])
+               {
+                       yaw = (atan2(value1[1], value1[0]) * 180 / M_PI);
+                       if (yaw < 0)
+                               yaw += 360;
+               }
+               else if (value1[1] > 0)
+                       yaw = 90;
+               else
+                       yaw = 270;
 
-               forward = sqrt (value1[0]*value1[0] + value1[1]*value1[1]);
+               forward = sqrt(value1[0]*value1[0] + value1[1]*value1[1]);
                pitch = (int) (atan2(value1[2], forward) * 180 / M_PI);
                if (pitch < 0)
                        pitch += 360;
@@ -555,9 +555,9 @@ random()
 void PF_random (void)
 {
        float           num;
-               
+
        num = (rand ()&0x7fff) / ((float)0x7fff);
-       
+
        G_FLOAT(OFS_RETURN) = num;
 }
 
@@ -573,7 +573,7 @@ void PF_particle (void)
        float           *org, *dir;
        float           color;
        float           count;
-                       
+
        org = G_VECTOR(OFS_PARM0);
        dir = G_VECTOR(OFS_PARM1);
        color = G_FLOAT(OFS_PARM2);
@@ -594,31 +594,42 @@ void PF_ambientsound (void)
        char            *samp;
        float           *pos;
        float           vol, attenuation;
-       int                     i, soundnum;
+       int                     i, soundnum, large;
 
-       pos = G_VECTOR (OFS_PARM0);                     
+       pos = G_VECTOR (OFS_PARM0);
        samp = G_STRING(OFS_PARM1);
        vol = G_FLOAT(OFS_PARM2);
        attenuation = G_FLOAT(OFS_PARM3);
-       
+
 // check to see if samp was properly precached
        for (soundnum=0, check = sv.sound_precache ; *check ; check++, soundnum++)
                if (!strcmp(*check,samp))
                        break;
-                       
+
        if (!*check)
        {
                Con_Printf ("no precache: %s\n", samp);
                return;
        }
 
-// add an svc_spawnambient command to the level signon packet
+       large = false;
+       if (soundnum >= 256)
+               large = true;
+
+       // add an svc_spawnambient command to the level signon packet
+
+       if (large)
+               MSG_WriteByte (&sv.signon, svc_spawnstaticsound2);
+       else
+               MSG_WriteByte (&sv.signon, svc_spawnstaticsound);
 
-       MSG_WriteByte (&sv.signon,svc_spawnstaticsound);
        for (i=0 ; i<3 ; i++)
-               MSG_WriteCoord(&sv.signon, pos[i]);
+               MSG_WriteDPCoord(&sv.signon, pos[i]);
 
-       MSG_WriteByte (&sv.signon, soundnum);
+       if (large)
+               MSG_WriteShort (&sv.signon, soundnum);
+       else
+               MSG_WriteByte (&sv.signon, soundnum);
 
        MSG_WriteByte (&sv.signon, vol*255);
        MSG_WriteByte (&sv.signon, attenuation*64);
@@ -633,7 +644,7 @@ Each entity can have eight independant sound sources, like voice,
 weapon, feet, etc.
 
 Channel 0 is an auto-allocate channel, the others override anything
-allready running on that entity/channel pair.
+already running on that entity/channel pair.
 
 An attenuation of 0 will play full volume everywhere in the level.
 Larger attenuations will drop off.
@@ -647,13 +658,13 @@ void PF_sound (void)
        edict_t         *entity;
        int             volume;
        float attenuation;
-               
+
        entity = G_EDICT(OFS_PARM0);
        channel = G_FLOAT(OFS_PARM1);
        sample = G_STRING(OFS_PARM2);
        volume = G_FLOAT(OFS_PARM3) * 255;
        attenuation = G_FLOAT(OFS_PARM4);
-       
+
        if (volume < 0 || volume > 255)
                Host_Error ("SV_StartSound: volume = %i", volume);
 
@@ -675,9 +686,7 @@ break()
 */
 void PF_break (void)
 {
-Con_Printf ("break statement\n");
-*(int *)-4 = 0;        // dump to debugger
-//     PR_RunError ("break statement");
+       Host_Error ("break statement");
 }
 
 /*
@@ -698,12 +707,14 @@ void PF_traceline (void)
        int             nomonsters;
        edict_t *ent;
 
+       pr_xfunction->builtinsprofile += 30;
+
        v1 = G_VECTOR(OFS_PARM0);
        v2 = G_VECTOR(OFS_PARM1);
        nomonsters = G_FLOAT(OFS_PARM2);
        ent = G_EDICT(OFS_PARM3);
 
-       trace = SV_Move (v1, vec3_origin, vec3_origin, v2, nomonsters, ent);
+       trace = SV_Move (v1, vec3_origin, vec3_origin, v2, nomonsters ? MOVE_NOMONSTERS : MOVE_NORMAL, ent);
 
        pr_global_struct->trace_allsolid = trace.allsolid;
        pr_global_struct->trace_startsolid = trace.startsolid;
@@ -712,11 +723,12 @@ void PF_traceline (void)
        pr_global_struct->trace_inopen = trace.inopen;
        VectorCopy (trace.endpos, pr_global_struct->trace_endpos);
        VectorCopy (trace.plane.normal, pr_global_struct->trace_plane_normal);
-       pr_global_struct->trace_plane_dist =  trace.plane.dist; 
+       pr_global_struct->trace_plane_dist =  trace.plane.dist;
        if (trace.ent)
                pr_global_struct->trace_ent = EDICT_TO_PROG(trace.ent);
        else
                pr_global_struct->trace_ent = EDICT_TO_PROG(sv.edicts);
+       // FIXME: add trace_endcontents
 }
 
 
@@ -739,6 +751,8 @@ void PF_tracebox (void)
        int             nomonsters;
        edict_t *ent;
 
+       pr_xfunction->builtinsprofile += 30;
+
        v1 = G_VECTOR(OFS_PARM0);
        m1 = G_VECTOR(OFS_PARM1);
        m2 = G_VECTOR(OFS_PARM2);
@@ -746,7 +760,7 @@ void PF_tracebox (void)
        nomonsters = G_FLOAT(OFS_PARM4);
        ent = G_EDICT(OFS_PARM5);
 
-       trace = SV_Move (v1, m1, m2, v2, nomonsters, ent);
+       trace = SV_Move (v1, m1, m2, v2, nomonsters ? MOVE_NOMONSTERS : MOVE_NORMAL, ent);
 
        pr_global_struct->trace_allsolid = trace.allsolid;
        pr_global_struct->trace_startsolid = trace.startsolid;
@@ -755,7 +769,7 @@ void PF_tracebox (void)
        pr_global_struct->trace_inopen = trace.inopen;
        VectorCopy (trace.endpos, pr_global_struct->trace_endpos);
        VectorCopy (trace.plane.normal, pr_global_struct->trace_plane_normal);
-       pr_global_struct->trace_plane_dist =  trace.plane.dist; 
+       pr_global_struct->trace_plane_dist =  trace.plane.dist;
        if (trace.ent)
                pr_global_struct->trace_ent = EDICT_TO_PROG(trace.ent);
        else
@@ -769,6 +783,8 @@ void PF_TraceToss (void)
        edict_t *ent;
        edict_t *ignore;
 
+       pr_xfunction->builtinsprofile += 600;
+
        ent = G_EDICT(OFS_PARM0);
        ignore = G_EDICT(OFS_PARM1);
 
@@ -781,7 +797,7 @@ void PF_TraceToss (void)
        pr_global_struct->trace_inopen = trace.inopen;
        VectorCopy (trace.endpos, pr_global_struct->trace_endpos);
        VectorCopy (trace.plane.normal, pr_global_struct->trace_plane_normal);
-       pr_global_struct->trace_plane_dist =  trace.plane.dist; 
+       pr_global_struct->trace_plane_dist =  trace.plane.dist;
        if (trace.ent)
                pr_global_struct->trace_ent = EDICT_TO_PROG(trace.ent);
        else
@@ -805,14 +821,12 @@ void PF_checkpos (void)
 
 //============================================================================
 
-byte   checkpvs[MAX_MAP_LEAFS/8];
+qbyte checkpvs[MAX_MAP_LEAFS/8];
 
 int PF_newcheckclient (int check)
 {
        int             i;
-       byte    *pvs;
        edict_t *ent;
-       mleaf_t *leaf;
        vec3_t  org;
 
 // cycle to the next one
@@ -829,6 +843,7 @@ int PF_newcheckclient (int check)
 
        for ( ;  ; i++)
        {
+               pr_xfunction->builtinsprofile++;
                if (i == svs.maxclients+1)
                        i = 1;
 
@@ -837,11 +852,11 @@ int PF_newcheckclient (int check)
                if (i == check)
                        break;  // didn't find anything else
 
-               if (ent->free)
+               if (ent->e->free)
                        continue;
-               if (ent->v.health <= 0)
+               if (ent->v->health <= 0)
                        continue;
-               if ((int)ent->v.flags & FL_NOTARGET)
+               if ((int)ent->v->flags & FL_NOTARGET)
                        continue;
 
        // anything that is a client, or has a client as an enemy
@@ -849,10 +864,8 @@ int PF_newcheckclient (int check)
        }
 
 // get the PVS for the entity
-       VectorAdd (ent->v.origin, ent->v.view_ofs, org);
-       leaf = Mod_PointInLeaf (org, sv.worldmodel);
-       pvs = Mod_LeafPVS (leaf, sv.worldmodel);
-       memcpy (checkpvs, pvs, (sv.worldmodel->numleafs+7)>>3 );
+       VectorAdd (ent->v->origin, ent->v->view_ofs, org);
+       memcpy (checkpvs, sv.worldmodel->LeafPVS(sv.worldmodel, sv.worldmodel->PointInLeaf(sv.worldmodel, org)), (sv.worldmodel->numleafs+7)>>3 );
 
        return i;
 }
@@ -864,7 +877,7 @@ PF_checkclient
 Returns a client (or object that has a client enemy) that would be a
 valid target.
 
-If there are more than one valid options, they are cycled each frame
+If there is more than one valid option, they are cycled each frame
 
 If (self.origin + self.viewofs) is not in the PVS of the current target,
 it is not returned at all.
@@ -872,7 +885,6 @@ it is not returned at all.
 name checkclient ()
 =================
 */
-#define        MAX_CHECK       16
 int c_invis, c_notvis;
 void PF_checkclient (void)
 {
@@ -880,36 +892,39 @@ void PF_checkclient (void)
        mleaf_t *leaf;
        int             l;
        vec3_t  view;
-       
-// find a new check if on a new frame
+
+       // find a new check if on a new frame
        if (sv.time - sv.lastchecktime >= 0.1)
        {
                sv.lastcheck = PF_newcheckclient (sv.lastcheck);
                sv.lastchecktime = sv.time;
        }
 
-// return check if it might be visible 
+       // return check if it might be visible
        ent = EDICT_NUM(sv.lastcheck);
-       if (ent->free || ent->v.health <= 0)
+       if (ent->e->free || ent->v->health <= 0)
        {
                RETURN_EDICT(sv.edicts);
                return;
        }
 
-// if current entity can't possibly see the check entity, return 0
+       // if current entity can't possibly see the check entity, return 0
        self = PROG_TO_EDICT(pr_global_struct->self);
-       VectorAdd (self->v.origin, self->v.view_ofs, view);
-       leaf = Mod_PointInLeaf (view, sv.worldmodel);
-       l = (leaf - sv.worldmodel->leafs) - 1;
-       if ( (l<0) || !(checkpvs[l>>3] & (1<<(l&7)) ) )
+       VectorAdd (self->v->origin, self->v->view_ofs, view);
+       leaf = sv.worldmodel->PointInLeaf(sv.worldmodel, view);
+       if (leaf)
        {
-c_notvis++;
-               RETURN_EDICT(sv.edicts);
-               return;
+               l = (leaf - sv.worldmodel->leafs) - 1;
+               if ( (l<0) || !(checkpvs[l>>3] & (1<<(l&7)) ) )
+               {
+                       c_notvis++;
+                       RETURN_EDICT(sv.edicts);
+                       return;
+               }
        }
 
-// might be able to see it
-c_invis++;
+       // might be able to see it
+       c_invis++;
        RETURN_EDICT(ent);
 }
 
@@ -930,12 +945,12 @@ void PF_stuffcmd (void)
        int             entnum;
        char    *str;
        client_t        *old;
-       
+
        entnum = G_EDICTNUM(OFS_PARM0);
        if (entnum < 1 || entnum > svs.maxclients)
-               PR_RunError ("Parm 0 not a client");
-       str = G_STRING(OFS_PARM1);      
-       
+               Host_Error ("Parm 0 not a client");
+       str = G_STRING(OFS_PARM1);
+
        old = host_client;
        host_client = &svs.clients[entnum-1];
        Host_ClientCommands ("%s", str);
@@ -954,8 +969,8 @@ localcmd (string)
 void PF_localcmd (void)
 {
        char    *str;
-       
-       str = G_STRING(OFS_PARM0);      
+
+       str = G_STRING(OFS_PARM0);
        Cbuf_AddText (str);
 }
 
@@ -969,9 +984,9 @@ float cvar (string)
 void PF_cvar (void)
 {
        char    *str;
-       
+
        str = G_STRING(OFS_PARM0);
-       
+
        G_FLOAT(OFS_RETURN) = Cvar_VariableValue (str);
 }
 
@@ -985,10 +1000,10 @@ float cvar (string)
 void PF_cvar_set (void)
 {
        char    *var, *val;
-       
+
        var = G_STRING(OFS_PARM0);
        val = G_STRING(OFS_PARM1);
-       
+
        Cvar_Set (var, val);
 }
 
@@ -1003,30 +1018,37 @@ findradius (origin, radius)
 */
 void PF_findradius (void)
 {
-       edict_t *ent, *chain;
-       float   rad;
-       float   *org;
-       vec3_t  eorg;
-       int             i, j;
+       edict_t *ent, *chain;
+       float radius;
+       float radius2;
+       float *org;
+       float eorg[3];
+       int i;
 
        chain = (edict_t *)sv.edicts;
-       
+
        org = G_VECTOR(OFS_PARM0);
-       rad = G_FLOAT(OFS_PARM1);
+       radius = G_FLOAT(OFS_PARM1);
+       radius2 = radius * radius;
 
        ent = NEXT_EDICT(sv.edicts);
        for (i=1 ; i<sv.num_edicts ; i++, ent = NEXT_EDICT(ent))
        {
-               if (ent->free)
+               pr_xfunction->builtinsprofile++;
+               if (ent->e->free)
                        continue;
-               if (ent->v.solid == SOLID_NOT)
+               if (ent->v->solid == SOLID_NOT)
                        continue;
-               for (j=0 ; j<3 ; j++)
-                       eorg[j] = org[j] - (ent->v.origin[j] + (ent->v.mins[j] + ent->v.maxs[j])*0.5);                  
-               if (Length(eorg) > rad)
+
+               // LordHavoc: compare against bounding box rather than center,
+               // and use DotProduct instead of Length, major speedup
+               eorg[0] = (org[0] - ent->v->origin[0]) - bound(ent->v->mins[0], (org[0] - ent->v->origin[0]), ent->v->maxs[0]);
+               eorg[1] = (org[1] - ent->v->origin[1]) - bound(ent->v->mins[1], (org[1] - ent->v->origin[1]), ent->v->maxs[1]);
+               eorg[2] = (org[2] - ent->v->origin[2]) - bound(ent->v->mins[2], (org[2] - ent->v->origin[2]), ent->v->maxs[2]);
+               if (DotProduct(eorg, eorg) > radius2)
                        continue;
-                       
-               ent->v.chain = EDICT_TO_PROG(chain);
+
+               ent->v->chain = EDICT_TO_PROG(chain);
                chain = ent;
        }
 
@@ -1044,22 +1066,30 @@ void PF_dprint (void)
        Con_DPrintf ("%s",PF_VarString(0));
 }
 
-char   pr_string_temp[128];
+// LordHavoc: added this to semi-fix the problem of using many ftos calls in a print
+#define STRINGTEMP_BUFFERS 16
+#define STRINGTEMP_LENGTH 128
+static char pr_string_temp[STRINGTEMP_BUFFERS][STRINGTEMP_LENGTH];
+static int pr_string_tempindex = 0;
+
+static char *PR_GetTempString(void)
+{
+       char *s;
+       s = pr_string_temp[pr_string_tempindex];
+       pr_string_tempindex = (pr_string_tempindex + 1) % STRINGTEMP_BUFFERS;
+       return s;
+}
 
 void PF_ftos (void)
 {
-       float   v;
+       float v;
+       char *s;
        v = G_FLOAT(OFS_PARM0);
 
+       s = PR_GetTempString();
        // LordHavoc: ftos improvement
-       sprintf (pr_string_temp, "%g", v);
-       /*
-       if (v == (int)v)
-               sprintf (pr_string_temp, "%d",(int)v);
-       else
-               sprintf (pr_string_temp, "%5.1f",v);
-       */
-       G_INT(OFS_RETURN) = pr_string_temp - pr_strings;
+       sprintf (s, "%g", v);
+       G_INT(OFS_RETURN) = PR_SetString(s);
 }
 
 void PF_fabs (void)
@@ -1071,19 +1101,24 @@ void PF_fabs (void)
 
 void PF_vtos (void)
 {
-       sprintf (pr_string_temp, "'%5.1f %5.1f %5.1f'", G_VECTOR(OFS_PARM0)[0], G_VECTOR(OFS_PARM0)[1], G_VECTOR(OFS_PARM0)[2]);
-       G_INT(OFS_RETURN) = pr_string_temp - pr_strings;
+       char *s;
+       s = PR_GetTempString();
+       sprintf (s, "'%5.1f %5.1f %5.1f'", G_VECTOR(OFS_PARM0)[0], G_VECTOR(OFS_PARM0)[1], G_VECTOR(OFS_PARM0)[2]);
+       G_INT(OFS_RETURN) = PR_SetString(s);
 }
 
 void PF_etos (void)
 {
-       sprintf (pr_string_temp, "entity %i", G_EDICTNUM(OFS_PARM0));
-       G_INT(OFS_RETURN) = pr_string_temp - pr_strings;
+       char *s;
+       s = PR_GetTempString();
+       sprintf (s, "entity %i", G_EDICTNUM(OFS_PARM0));
+       G_INT(OFS_RETURN) = PR_SetString(s);
 }
 
 void PF_Spawn (void)
 {
        edict_t *ed;
+       pr_xfunction->builtinsprofile += 20;
        ed = ED_Alloc();
        RETURN_EDICT(ed);
 }
@@ -1091,8 +1126,13 @@ void PF_Spawn (void)
 void PF_Remove (void)
 {
        edict_t *ed;
-       
+       pr_xfunction->builtinsprofile += 20;
+
        ed = G_EDICT(OFS_PARM0);
+       if (ed == sv.edicts)
+               Host_Error("remove: tried to remove world\n");
+       if (NUM_FOR_EDICT(ed) <= svs.maxclients)
+               Host_Error("remove: tried to remove a client\n");
        ED_Free (ed);
 }
 
@@ -1100,7 +1140,7 @@ void PF_Remove (void)
 // entity (entity start, .string field, string match) find = #5;
 void PF_Find (void)
 {
-       int             e;      
+       int             e;
        int             f;
        char    *s, *t;
        edict_t *ed;
@@ -1108,13 +1148,17 @@ void PF_Find (void)
        e = G_EDICTNUM(OFS_PARM0);
        f = G_INT(OFS_PARM1);
        s = G_STRING(OFS_PARM2);
-       if (!s)
-               PR_RunError ("PF_Find: bad search string");
-               
+       if (!s || !s[0])
+       {
+               RETURN_EDICT(sv.edicts);
+               return;
+       }
+
        for (e++ ; e < sv.num_edicts ; e++)
        {
+               pr_xfunction->builtinsprofile++;
                ed = EDICT_NUM(e);
-               if (ed->free)
+               if (ed->e->free)
                        continue;
                t = E_STRING(ed,f);
                if (!t)
@@ -1132,7 +1176,7 @@ void PF_Find (void)
 // LordHavoc: added this for searching float, int, and entity reference fields
 void PF_FindFloat (void)
 {
-       int             e;      
+       int             e;
        int             f;
        float   s;
        edict_t *ed;
@@ -1140,11 +1184,12 @@ void PF_FindFloat (void)
        e = G_EDICTNUM(OFS_PARM0);
        f = G_INT(OFS_PARM1);
        s = G_FLOAT(OFS_PARM2);
-               
+
        for (e++ ; e < sv.num_edicts ; e++)
        {
+               pr_xfunction->builtinsprofile++;
                ed = EDICT_NUM(e);
-               if (ed->free)
+               if (ed->e->free)
                        continue;
                if (E_FLOAT(ed,f) == s)
                {
@@ -1156,10 +1201,78 @@ void PF_FindFloat (void)
        RETURN_EDICT(sv.edicts);
 }
 
+// chained search for strings in entity fields
+// entity(.string field, string match) findchain = #402;
+void PF_findchain (void)
+{
+       int             i;
+       int             f;
+       char    *s, *t;
+       edict_t *ent, *chain;
+
+       chain = (edict_t *)sv.edicts;
+
+       f = G_INT(OFS_PARM0);
+       s = G_STRING(OFS_PARM1);
+       if (!s || !s[0])
+       {
+               RETURN_EDICT(sv.edicts);
+               return;
+       }
+
+       ent = NEXT_EDICT(sv.edicts);
+       for (i = 1;i < sv.num_edicts;i++, ent = NEXT_EDICT(ent))
+       {
+               pr_xfunction->builtinsprofile++;
+               if (ent->e->free)
+                       continue;
+               t = E_STRING(ent,f);
+               if (!t)
+                       continue;
+               if (strcmp(t,s))
+                       continue;
+
+               ent->v->chain = EDICT_TO_PROG(chain);
+               chain = ent;
+       }
+
+       RETURN_EDICT(chain);
+}
+
+// LordHavoc: chained search for float, int, and entity reference fields
+// entity(.string field, float match) findchainfloat = #403;
+void PF_findchainfloat (void)
+{
+       int             i;
+       int             f;
+       float   s;
+       edict_t *ent, *chain;
+
+       chain = (edict_t *)sv.edicts;
+
+       f = G_INT(OFS_PARM0);
+       s = G_FLOAT(OFS_PARM1);
+
+       ent = NEXT_EDICT(sv.edicts);
+       for (i = 1;i < sv.num_edicts;i++, ent = NEXT_EDICT(ent))
+       {
+               pr_xfunction->builtinsprofile++;
+               if (ent->e->free)
+                       continue;
+               if (E_FLOAT(ent,f) != s)
+                       continue;
+
+               ent->v->chain = EDICT_TO_PROG(chain);
+               chain = ent;
+       }
+
+       RETURN_EDICT(chain);
+}
+
 void PR_CheckEmptyString (char *s)
 {
        if (s[0] <= ' ')
-               PR_RunError ("Bad string");
+               Host_Error ("Bad string");
 }
 
 void PF_precache_file (void)
@@ -1171,14 +1284,14 @@ void PF_precache_sound (void)
 {
        char    *s;
        int             i;
-       
+
        if (sv.state != ss_loading)
-               PR_RunError ("PF_Precache_*: Precache can only be done in spawn functions");
-               
+               Host_Error ("PF_Precache_*: Precache can only be done in spawn functions");
+
        s = G_STRING(OFS_PARM0);
        G_INT(OFS_RETURN) = G_INT(OFS_PARM0);
        PR_CheckEmptyString (s);
-       
+
        for (i=0 ; i<MAX_SOUNDS ; i++)
        {
                if (!sv.sound_precache[i])
@@ -1189,19 +1302,20 @@ void PF_precache_sound (void)
                if (!strcmp(sv.sound_precache[i], s))
                        return;
        }
-       PR_RunError ("PF_precache_sound: overflow");
+       Host_Error ("PF_precache_sound: overflow");
 }
 
-int blahblah = 0;
 void PF_precache_model (void)
 {
        char    *s;
        int             i;
-       
+
        if (sv.state != ss_loading)
-               PR_RunError ("PF_Precache_*: Precache can only be done in spawn functions");
-               
+               Host_Error ("PF_Precache_*: Precache can only be done in spawn functions");
+
        s = G_STRING(OFS_PARM0);
+       if (sv.worldmodel->ishlbsp && ((!s) || (!s[0])))
+               return;
        G_INT(OFS_RETURN) = G_INT(OFS_PARM0);
        PR_CheckEmptyString (s);
 
@@ -1210,17 +1324,13 @@ void PF_precache_model (void)
                if (!sv.model_precache[i])
                {
                        sv.model_precache[i] = s;
-                       if (sv.active < 0)
-                               blahblah++;
-                       sv.models[i] = Mod_ForName (s, true);
-                       if (sv.active < 0)
-                               blahblah++;
+                       sv.models[i] = Mod_ForName (s, true, false, false);
                        return;
                }
                if (!strcmp(sv.model_precache[i], s))
                        return;
        }
-       PR_RunError ("PF_precache_model: overflow");
+       Host_Error ("PF_precache_model: overflow");
 }
 
 
@@ -1256,21 +1366,21 @@ void PF_walkmove (void)
        edict_t *ent;
        float   yaw, dist;
        vec3_t  move;
-       dfunction_t     *oldf;
+       mfunction_t     *oldf;
        int     oldself;
-       
+
        ent = PROG_TO_EDICT(pr_global_struct->self);
        yaw = G_FLOAT(OFS_PARM0);
        dist = G_FLOAT(OFS_PARM1);
-       
-       if ( !( (int)ent->v.flags & (FL_ONGROUND|FL_FLY|FL_SWIM) ) )
+
+       if ( !( (int)ent->v->flags & (FL_ONGROUND|FL_FLY|FL_SWIM) ) )
        {
                G_FLOAT(OFS_RETURN) = 0;
                return;
        }
 
        yaw = yaw*M_PI*2 / 360;
-       
+
        move[0] = cos(yaw)*dist;
        move[1] = sin(yaw)*dist;
        move[2] = 0;
@@ -1278,10 +1388,10 @@ void PF_walkmove (void)
 // save program state, because SV_movestep may call other progs
        oldf = pr_xfunction;
        oldself = pr_global_struct->self;
-       
+
        G_FLOAT(OFS_RETURN) = SV_movestep(ent, move, true);
-       
-       
+
+
 // restore program state
        pr_xfunction = oldf;
        pr_global_struct->self = oldself;
@@ -1299,23 +1409,25 @@ void PF_droptofloor (void)
        edict_t         *ent;
        vec3_t          end;
        trace_t         trace;
-       
+
        ent = PROG_TO_EDICT(pr_global_struct->self);
 
-       VectorCopy (ent->v.origin, end);
+       VectorCopy (ent->v->origin, end);
        end[2] -= 256;
-       
-       trace = SV_Move (ent->v.origin, ent->v.mins, ent->v.maxs, end, false, ent);
 
-       if (trace.fraction == 1 || trace.allsolid)
+       trace = SV_Move (ent->v->origin, ent->v->mins, ent->v->maxs, end, MOVE_NORMAL, ent);
+
+       if (trace.fraction == 1)
                G_FLOAT(OFS_RETURN) = 0;
        else
        {
-               VectorCopy (trace.endpos, ent->v.origin);
+               VectorCopy (trace.endpos, ent->v->origin);
                SV_LinkEdict (ent, false);
-               ent->v.flags = (int)ent->v.flags | FL_ONGROUND;
-               ent->v.groundentity = EDICT_TO_PROG(trace.ent);
+               ent->v->flags = (int)ent->v->flags | FL_ONGROUND;
+               ent->v->groundentity = EDICT_TO_PROG(trace.ent);
                G_FLOAT(OFS_RETURN) = 1;
+               // if support is destroyed, keep suspended (gross hack for floating items in various maps)
+               ent->e->suspendedinairflag = true;
        }
 }
 
@@ -1332,17 +1444,17 @@ void PF_lightstyle (void)
        char    *val;
        client_t        *client;
        int                     j;
-       
+
        style = G_FLOAT(OFS_PARM0);
        val = G_STRING(OFS_PARM1);
 
 // change the string in sv
        sv.lightstyles[style] = val;
-       
+
 // send message to all clients on this server
        if (sv.state != ss_active)
                return;
-       
+
        for (j=0, client = svs.clients ; j<svs.maxclients ; j++, client++)
                if (client->active || client->spawned)
                {
@@ -1388,7 +1500,7 @@ PF_pointcontents
 */
 void PF_pointcontents (void)
 {
-       G_FLOAT(OFS_RETURN) = SV_PointContents (G_VECTOR(OFS_PARM0));
+       G_FLOAT(OFS_RETURN) = sv.worldmodel->PointContents(sv.worldmodel, G_VECTOR(OFS_PARM0));
 }
 
 /*
@@ -1402,10 +1514,11 @@ void PF_nextent (void)
 {
        int             i;
        edict_t *ent;
-       
+
        i = G_EDICTNUM(OFS_PARM0);
        while (1)
        {
+               pr_xfunction->builtinsprofile++;
                i++;
                if (i == sv.num_edicts)
                {
@@ -1413,7 +1526,7 @@ void PF_nextent (void)
                        return;
                }
                ent = EDICT_NUM(i);
-               if (!ent->free)
+               if (!ent->e->free)
                {
                        RETURN_EDICT(ent);
                        return;
@@ -1429,7 +1542,6 @@ Pick a vector for the player to shoot along
 vector aim(entity, missilespeed)
 =============
 */
-cvar_t sv_aim = {"sv_aim", "0.93"};
 void PF_aim (void)
 {
        edict_t *ent, *check, *bestent;
@@ -1438,19 +1550,19 @@ void PF_aim (void)
        trace_t tr;
        float   dist, bestdist;
        float   speed;
-       
+
        ent = G_EDICT(OFS_PARM0);
        speed = G_FLOAT(OFS_PARM1);
 
-       VectorCopy (ent->v.origin, start);
+       VectorCopy (ent->v->origin, start);
        start[2] += 20;
 
 // try sending a trace straight
        VectorCopy (pr_global_struct->v_forward, dir);
        VectorMA (start, 2048, dir, end);
-       tr = SV_Move (start, vec3_origin, vec3_origin, end, false, ent);
-       if (tr.ent && tr.ent->v.takedamage == DAMAGE_AIM
-       && (!teamplay.value || ent->v.team <=0 || ent->v.team != tr.ent->v.team) )
+       tr = SV_Move (start, vec3_origin, vec3_origin, end, MOVE_NORMAL, ent);
+       if (tr.ent && ((edict_t *)tr.ent)->v->takedamage == DAMAGE_AIM
+       && (!teamplay.integer || ent->v->team <=0 || ent->v->team != ((edict_t *)tr.ent)->v->team) )
        {
                VectorCopy (pr_global_struct->v_forward, G_VECTOR(OFS_RETURN));
                return;
@@ -1461,40 +1573,41 @@ void PF_aim (void)
        VectorCopy (dir, bestdir);
        bestdist = sv_aim.value;
        bestent = NULL;
-       
+
        check = NEXT_EDICT(sv.edicts);
        for (i=1 ; i<sv.num_edicts ; i++, check = NEXT_EDICT(check) )
        {
-               if (check->v.takedamage != DAMAGE_AIM)
+               pr_xfunction->builtinsprofile++;
+               if (check->v->takedamage != DAMAGE_AIM)
                        continue;
                if (check == ent)
                        continue;
-               if (teamplay.value && ent->v.team > 0 && ent->v.team == check->v.team)
+               if (teamplay.integer && ent->v->team > 0 && ent->v->team == check->v->team)
                        continue;       // don't aim at teammate
                for (j=0 ; j<3 ; j++)
-                       end[j] = check->v.origin[j]
-                       + 0.5*(check->v.mins[j] + check->v.maxs[j]);
+                       end[j] = check->v->origin[j]
+                       + 0.5*(check->v->mins[j] + check->v->maxs[j]);
                VectorSubtract (end, start, dir);
                VectorNormalize (dir);
                dist = DotProduct (dir, pr_global_struct->v_forward);
                if (dist < bestdist)
                        continue;       // to far to turn
-               tr = SV_Move (start, vec3_origin, vec3_origin, end, false, ent);
+               tr = SV_Move (start, vec3_origin, vec3_origin, end, MOVE_NORMAL, ent);
                if (tr.ent == check)
                {       // can shoot at this one
                        bestdist = dist;
                        bestent = check;
                }
        }
-       
+
        if (bestent)
        {
-               VectorSubtract (bestent->v.origin, ent->v.origin, dir);
+               VectorSubtract (bestent->v->origin, ent->v->origin, dir);
                dist = DotProduct (dir, pr_global_struct->v_forward);
                VectorScale (pr_global_struct->v_forward, dist, end);
                end[2] = dir[2];
                VectorNormalize (end);
-               VectorCopy (end, G_VECTOR(OFS_RETURN)); 
+               VectorCopy (end, G_VECTOR(OFS_RETURN));
        }
        else
        {
@@ -1513,12 +1626,12 @@ void PF_changeyaw (void)
 {
        edict_t         *ent;
        float           ideal, current, move, speed;
-       
+
        ent = PROG_TO_EDICT(pr_global_struct->self);
-       current = anglemod( ent->v.angles[1] );
-       ideal = ent->v.ideal_yaw;
-       speed = ent->v.yaw_speed;
-       
+       current = ANGLEMOD(ent->v->angles[1]);
+       ideal = ent->v->ideal_yaw;
+       speed = ent->v->yaw_speed;
+
        if (current == ideal)
                return;
        move = ideal - current;
@@ -1542,8 +1655,8 @@ void PF_changeyaw (void)
                if (move < -speed)
                        move = -speed;
        }
-       
-       ent->v.angles[1] = anglemod (current + move);
+
+       ent->v->angles[1] = ANGLEMOD (current + move);
 }
 
 /*
@@ -1556,24 +1669,24 @@ void PF_changepitch (void)
        edict_t         *ent;
        float           ideal, current, move, speed;
        eval_t          *val;
-       
+
        ent = G_EDICT(OFS_PARM0);
-       current = anglemod( ent->v.angles[0] );
+       current = ANGLEMOD( ent->v->angles[0] );
        if ((val = GETEDICTFIELDVALUE(ent, eval_idealpitch)))
                ideal = val->_float;
        else
        {
-               PR_RunError ("PF_changepitch: .float idealpitch and .float pitch_speed must be defined to use changepitch");
+               Host_Error ("PF_changepitch: .float idealpitch and .float pitch_speed must be defined to use changepitch");
                return;
        }
        if ((val = GETEDICTFIELDVALUE(ent, eval_pitch_speed)))
                speed = val->_float;
        else
        {
-               PR_RunError ("PF_changepitch: .float idealpitch and .float pitch_speed must be defined to use changepitch");
+               Host_Error ("PF_changepitch: .float idealpitch and .float pitch_speed must be defined to use changepitch");
                return;
        }
-       
+
        if (current == ideal)
                return;
        move = ideal - current;
@@ -1597,8 +1710,8 @@ void PF_changepitch (void)
                if (move < -speed)
                        move = -speed;
        }
-       
-       ent->v.angles[0] = anglemod (current + move);
+
+       ent->v->angles[0] = ANGLEMOD (current + move);
 }
 
 /*
@@ -1625,25 +1738,25 @@ sizebuf_t *WriteDest (void)
        {
        case MSG_BROADCAST:
                return &sv.datagram;
-       
+
        case MSG_ONE:
                ent = PROG_TO_EDICT(pr_global_struct->msg_entity);
                entnum = NUM_FOR_EDICT(ent);
                if (entnum < 1 || entnum > svs.maxclients)
-                       PR_RunError ("WriteDest: not a client");
+                       Host_Error ("WriteDest: not a client");
                return &svs.clients[entnum-1].message;
-               
+
        case MSG_ALL:
                return &sv.reliable_datagram;
-       
+
        case MSG_INIT:
                return &sv.signon;
 
        default:
-               PR_RunError ("WriteDest: bad destination");
+               Host_Error ("WriteDest: bad destination");
                break;
        }
-       
+
        return NULL;
 }
 
@@ -1674,7 +1787,7 @@ void PF_WriteAngle (void)
 
 void PF_WriteCoord (void)
 {
-       MSG_WriteCoord (WriteDest(), G_FLOAT(OFS_PARM1));
+       MSG_WriteDPCoord (WriteDest(), G_FLOAT(OFS_PARM1));
 }
 
 void PF_WriteString (void)
@@ -1690,26 +1803,36 @@ void PF_WriteEntity (void)
 
 //=============================================================================
 
-int SV_ModelIndex (char *name);
-
 void PF_makestatic (void)
 {
-       edict_t *ent;
-       int             i;
-       
+       edict_t *ent;
+       int i, large;
+
        ent = G_EDICT(OFS_PARM0);
 
-       MSG_WriteByte (&sv.signon,svc_spawnstatic);
+       large = false;
+       if (ent->v->modelindex >= 256 || ent->v->frame >= 256)
+               large = true;
 
-       MSG_WriteByte (&sv.signon, SV_ModelIndex(pr_strings + ent->v.model));
+       if (large)
+       {
+               MSG_WriteByte (&sv.signon,svc_spawnstatic2);
+               MSG_WriteShort (&sv.signon, ent->v->modelindex);
+               MSG_WriteShort (&sv.signon, ent->v->frame);
+       }
+       else
+       {
+               MSG_WriteByte (&sv.signon,svc_spawnstatic);
+               MSG_WriteByte (&sv.signon, ent->v->modelindex);
+               MSG_WriteByte (&sv.signon, ent->v->frame);
+       }
 
-       MSG_WriteByte (&sv.signon, ent->v.frame);
-       MSG_WriteByte (&sv.signon, ent->v.colormap);
-       MSG_WriteByte (&sv.signon, ent->v.skin);
+       MSG_WriteByte (&sv.signon, ent->v->colormap);
+       MSG_WriteByte (&sv.signon, ent->v->skin);
        for (i=0 ; i<3 ; i++)
        {
-               MSG_WriteCoord(&sv.signon, ent->v.origin[i]);
-               MSG_WriteAngle(&sv.signon, ent->v.angles[i]);
+               MSG_WriteDPCoord(&sv.signon, ent->v->origin[i]);
+               MSG_WriteAngle(&sv.signon, ent->v->angles[i]);
        }
 
 // throw the entity away now
@@ -1732,7 +1855,7 @@ void PF_setspawnparms (void)
        ent = G_EDICT(OFS_PARM0);
        i = NUM_FOR_EDICT(ent);
        if (i < 1 || i > svs.maxclients)
-               PR_RunError ("Entity is not a client");
+               Host_Error ("Entity is not a client");
 
        // copy spawn parms out of the client_t
        client = svs.clients + (i-1);
@@ -1754,7 +1877,7 @@ void PF_changelevel (void)
        if (svs.changelevel_issued)
                return;
        svs.changelevel_issued = true;
-       
+
        s = G_STRING(OFS_PARM0);
        Cbuf_AddText (va("changelevel %s\n",s));
 }
@@ -1793,7 +1916,7 @@ void PF_randomvec (void)
                temp[2] = (rand()&32767) * (2.0 / 32767.0) - 1.0;
        }
        while (DotProduct(temp, temp) >= 1);
-       VectorCopy (temp, G_VECTOR(OFS_RETURN));        
+       VectorCopy (temp, G_VECTOR(OFS_RETURN));
 }
 
 void SV_LightPoint (vec3_t color, vec3_t p);
@@ -1815,7 +1938,7 @@ void PF_GetLight (void)
        vec_t*          p;
        p = G_VECTOR(OFS_PARM0);
        SV_LightPoint (color, p);
-       VectorCopy (color, G_VECTOR(OFS_RETURN));       
+       VectorCopy (color, G_VECTOR(OFS_RETURN));
 }
 
 #define MAX_QC_CVARS 128
@@ -1824,15 +1947,15 @@ int currentqc_cvar;
 
 void PF_registercvar (void)
 {
-       char    *name, *value;
-       cvar_t  *variable;
-       name = G_STRING(OFS_PARM1);
-       value = G_STRING(OFS_PARM2);
+       char *name, *value;
+       cvar_t *variable;
+       name = G_STRING(OFS_PARM0);
+       value = G_STRING(OFS_PARM1);
        G_FLOAT(OFS_RETURN) = 0;
-// first check to see if it has allready been defined
+// first check to see if it has already been defined
        if (Cvar_FindVar (name))
                return;
-       
+
 // check for overlap with a command
        if (Cmd_Exists (name))
        {
@@ -1841,19 +1964,17 @@ void PF_registercvar (void)
        }
 
        if (currentqc_cvar >= MAX_QC_CVARS)
-               PR_RunError ("PF_registercvar: ran out of cvar slots (%i)\n", MAX_QC_CVARS);
+               Host_Error ("PF_registercvar: ran out of cvar slots (%i)\n", MAX_QC_CVARS);
 
 // copy the name and value
        variable = &qc_cvar[currentqc_cvar++];
-       variable->name = Z_Malloc (strlen(name)+1);     
+       variable->name = Z_Malloc (strlen(name)+1);
        strcpy (variable->name, name);
-       variable->string = Z_Malloc (strlen(value)+1);  
+       variable->string = Z_Malloc (strlen(value)+1);
        strcpy (variable->string, value);
        variable->value = atof (value);
-       
-// link the variable in
-       variable->next = cvar_vars;
-       cvar_vars = variable;
+
+       Cvar_RegisterVariable(variable);
        G_FLOAT(OFS_RETURN) = 1; // success
 }
 
@@ -1881,7 +2002,7 @@ void PF_min (void)
                G_FLOAT(OFS_RETURN) = f;
        }
        else
-               PR_RunError("min: must supply at least 2 floats\n");
+               Host_Error("min: must supply at least 2 floats\n");
 }
 
 /*
@@ -1908,7 +2029,7 @@ void PF_max (void)
                G_FLOAT(OFS_RETURN) = f;
        }
        else
-               PR_RunError("max: must supply at least 2 floats\n");
+               Host_Error("max: must supply at least 2 floats\n");
 }
 
 /*
@@ -1953,7 +2074,7 @@ void PF_copyentity (void)
        edict_t *in, *out;
        in = G_EDICT(OFS_PARM0);
        out = G_EDICT(OFS_PARM1);
-       memcpy(out, in, pr_edict_size);
+       memcpy(out->v, in->v, progs->entityfields * 4);
 }
 
 /*
@@ -1967,155 +2088,1062 @@ setcolor(clientent, value)
 */
 void PF_setcolor (void)
 {
-       client_t        *client;
-       int                     entnum, i;
-       
+       client_t *client;
+       int entnum, i;
+       eval_t *val;
+
        entnum = G_EDICTNUM(OFS_PARM0);
        i = G_FLOAT(OFS_PARM1);
-       
+
        if (entnum < 1 || entnum > svs.maxclients)
        {
                Con_Printf ("tried to setcolor a non-client\n");
                return;
        }
-               
+
        client = &svs.clients[entnum-1];
+       if ((val = GETEDICTFIELDVALUE(client->edict, eval_clientcolors)))
+               val->_float = i;
        client->colors = i;
-       client->edict->v.team = (i & 15) + 1;
-               
+       client->old_colors = i;
+       client->edict->v->team = (i & 15) + 1;
+
        MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors);
        MSG_WriteByte (&sv.reliable_datagram, entnum - 1);
        MSG_WriteByte (&sv.reliable_datagram, i);
 }
 
-void PF_Fixme (void)
+/*
+=================
+PF_effect
+
+effect(origin, modelname, startframe, framecount, framerate)
+=================
+*/
+void PF_effect (void)
 {
-       PR_RunError ("unimplemented builtin"); // LordHavoc: was misspelled (bulitin)
+       char *s;
+       s = G_STRING(OFS_PARM1);
+       if (!s || !s[0])
+               Host_Error("effect: no model specified\n");
+
+       SV_StartEffect(G_VECTOR(OFS_PARM0), SV_ModelIndex(s), G_FLOAT(OFS_PARM2), G_FLOAT(OFS_PARM3), G_FLOAT(OFS_PARM4));
 }
 
+void PF_te_blood (void)
+{
+       if (G_FLOAT(OFS_PARM2) < 1)
+               return;
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_BLOOD);
+       // origin
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+       // velocity
+       MSG_WriteByte(&sv.datagram, bound(-128, (int) G_VECTOR(OFS_PARM1)[0], 127));
+       MSG_WriteByte(&sv.datagram, bound(-128, (int) G_VECTOR(OFS_PARM1)[1], 127));
+       MSG_WriteByte(&sv.datagram, bound(-128, (int) G_VECTOR(OFS_PARM1)[2], 127));
+       // count
+       MSG_WriteByte(&sv.datagram, bound(0, (int) G_FLOAT(OFS_PARM2), 255));
+}
+
+void PF_te_bloodshower (void)
+{
+       if (G_FLOAT(OFS_PARM3) < 1)
+               return;
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_BLOODSHOWER);
+       // min
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+       // max
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]);
+       // speed
+       MSG_WriteDPCoord(&sv.datagram, G_FLOAT(OFS_PARM2));
+       // count
+       MSG_WriteShort(&sv.datagram, bound(0, G_FLOAT(OFS_PARM3), 65535));
+}
+
+void PF_te_explosionrgb (void)
+{
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_EXPLOSIONRGB);
+       // origin
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+       // color
+       MSG_WriteByte(&sv.datagram, bound(0, (int) (G_VECTOR(OFS_PARM1)[0] * 255), 255));
+       MSG_WriteByte(&sv.datagram, bound(0, (int) (G_VECTOR(OFS_PARM1)[1] * 255), 255));
+       MSG_WriteByte(&sv.datagram, bound(0, (int) (G_VECTOR(OFS_PARM1)[2] * 255), 255));
+}
+
+void PF_te_particlecube (void)
+{
+       if (G_FLOAT(OFS_PARM3) < 1)
+               return;
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_PARTICLECUBE);
+       // min
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+       // max
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]);
+       // velocity
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]);
+       // count
+       MSG_WriteShort(&sv.datagram, bound(0, G_FLOAT(OFS_PARM3), 65535));
+       // color
+       MSG_WriteByte(&sv.datagram, G_FLOAT(OFS_PARM4));
+       // gravity true/false
+       MSG_WriteByte(&sv.datagram, ((int) G_FLOAT(OFS_PARM5)) != 0);
+       // randomvel
+       MSG_WriteDPCoord(&sv.datagram, G_FLOAT(OFS_PARM6));
+}
+
+void PF_te_particlerain (void)
+{
+       if (G_FLOAT(OFS_PARM3) < 1)
+               return;
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_PARTICLERAIN);
+       // min
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+       // max
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]);
+       // velocity
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]);
+       // count
+       MSG_WriteShort(&sv.datagram, bound(0, G_FLOAT(OFS_PARM3), 65535));
+       // color
+       MSG_WriteByte(&sv.datagram, G_FLOAT(OFS_PARM4));
+}
+
+void PF_te_particlesnow (void)
+{
+       if (G_FLOAT(OFS_PARM3) < 1)
+               return;
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_PARTICLESNOW);
+       // min
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+       // max
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]);
+       // velocity
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]);
+       // count
+       MSG_WriteShort(&sv.datagram, bound(0, G_FLOAT(OFS_PARM3), 65535));
+       // color
+       MSG_WriteByte(&sv.datagram, G_FLOAT(OFS_PARM4));
+}
+
+void PF_te_spark (void)
+{
+       if (G_FLOAT(OFS_PARM2) < 1)
+               return;
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_SPARK);
+       // origin
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+       // velocity
+       MSG_WriteByte(&sv.datagram, bound(-128, (int) G_VECTOR(OFS_PARM1)[0], 127));
+       MSG_WriteByte(&sv.datagram, bound(-128, (int) G_VECTOR(OFS_PARM1)[1], 127));
+       MSG_WriteByte(&sv.datagram, bound(-128, (int) G_VECTOR(OFS_PARM1)[2], 127));
+       // count
+       MSG_WriteByte(&sv.datagram, bound(0, (int) G_FLOAT(OFS_PARM2), 255));
+}
+
+void PF_te_gunshotquad (void)
+{
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_GUNSHOTQUAD);
+       // origin
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+}
+
+void PF_te_spikequad (void)
+{
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_SPIKEQUAD);
+       // origin
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+}
+
+void PF_te_superspikequad (void)
+{
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_SUPERSPIKEQUAD);
+       // origin
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+}
+
+void PF_te_explosionquad (void)
+{
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_EXPLOSIONQUAD);
+       // origin
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+}
+
+void PF_te_smallflash (void)
+{
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_SMALLFLASH);
+       // origin
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+}
+
+void PF_te_customflash (void)
+{
+       if (G_FLOAT(OFS_PARM1) < 8 || G_FLOAT(OFS_PARM2) < (1.0 / 256.0))
+               return;
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_CUSTOMFLASH);
+       // origin
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+       // radius
+       MSG_WriteByte(&sv.datagram, bound(0, G_FLOAT(OFS_PARM1) / 8 - 1, 255));
+       // lifetime
+       MSG_WriteByte(&sv.datagram, bound(0, G_FLOAT(OFS_PARM2) / 256 - 1, 255));
+       // color
+       MSG_WriteByte(&sv.datagram, bound(0, G_VECTOR(OFS_PARM3)[0] * 255, 255));
+       MSG_WriteByte(&sv.datagram, bound(0, G_VECTOR(OFS_PARM3)[1] * 255, 255));
+       MSG_WriteByte(&sv.datagram, bound(0, G_VECTOR(OFS_PARM3)[2] * 255, 255));
+}
+
+void PF_te_gunshot (void)
+{
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_GUNSHOT);
+       // origin
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+}
+
+void PF_te_spike (void)
+{
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_SPIKE);
+       // origin
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+}
+
+void PF_te_superspike (void)
+{
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_SUPERSPIKE);
+       // origin
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+}
+
+void PF_te_explosion (void)
+{
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_EXPLOSION);
+       // origin
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+}
+
+void PF_te_tarexplosion (void)
+{
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_TAREXPLOSION);
+       // origin
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+}
+
+void PF_te_wizspike (void)
+{
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_WIZSPIKE);
+       // origin
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+}
+
+void PF_te_knightspike (void)
+{
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_KNIGHTSPIKE);
+       // origin
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+}
+
+void PF_te_lavasplash (void)
+{
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_LAVASPLASH);
+       // origin
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+}
+
+void PF_te_teleport (void)
+{
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_TELEPORT);
+       // origin
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+}
+
+void PF_te_explosion2 (void)
+{
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_EXPLOSION2);
+       // origin
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+       // color
+       MSG_WriteByte(&sv.datagram, G_FLOAT(OFS_PARM1));
+}
+
+void PF_te_lightning1 (void)
+{
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_LIGHTNING1);
+       // owner entity
+       MSG_WriteShort(&sv.datagram, G_EDICTNUM(OFS_PARM0));
+       // start
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]);
+       // end
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]);
+}
+
+void PF_te_lightning2 (void)
+{
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_LIGHTNING2);
+       // owner entity
+       MSG_WriteShort(&sv.datagram, G_EDICTNUM(OFS_PARM0));
+       // start
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]);
+       // end
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]);
+}
+
+void PF_te_lightning3 (void)
+{
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_LIGHTNING3);
+       // owner entity
+       MSG_WriteShort(&sv.datagram, G_EDICTNUM(OFS_PARM0));
+       // start
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]);
+       // end
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]);
+}
+
+void PF_te_beam (void)
+{
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_BEAM);
+       // owner entity
+       MSG_WriteShort(&sv.datagram, G_EDICTNUM(OFS_PARM0));
+       // start
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]);
+       // end
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]);
+}
+
+void PF_te_plasmaburn (void)
+{
+       MSG_WriteByte(&sv.datagram, svc_temp_entity);
+       MSG_WriteByte(&sv.datagram, TE_PLASMABURN);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
+       MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+}
+
+static void clippointtosurface(msurface_t *surf, vec3_t p, vec3_t out)
+{
+       int i, j;
+       vec3_t v1, clipplanenormal, normal;
+       vec_t clipplanedist, clipdist;
+       VectorCopy(p, out);
+       if (surf->flags & SURF_PLANEBACK)
+               VectorNegate(surf->plane->normal, normal);
+       else
+               VectorCopy(surf->plane->normal, normal);
+       for (i = 0, j = surf->poly_numverts - 1;i < surf->poly_numverts;j = i, i++)
+       {
+               VectorSubtract(&surf->poly_verts[j * 3], &surf->poly_verts[i * 3], v1);
+               VectorNormalizeFast(v1);
+               CrossProduct(v1, normal, clipplanenormal);
+               clipplanedist = DotProduct(&surf->poly_verts[i * 3], clipplanenormal);
+               clipdist = DotProduct(out, clipplanenormal) - clipplanedist;
+               if (clipdist > 0)
+               {
+                       clipdist = -clipdist;
+                       VectorMA(out, clipdist, clipplanenormal, out);
+               }
+       }
+}
+
+static msurface_t *getsurface(edict_t *ed, int surfnum)
+{
+       int modelindex;
+       model_t *model;
+       if (!ed || ed->e->free)
+               return NULL;
+       modelindex = ed->v->modelindex;
+       if (modelindex < 1 || modelindex >= MAX_MODELS)
+               return NULL;
+       model = sv.models[modelindex];
+       if (model->type != mod_brush)
+               return NULL;
+       if (surfnum < 0 || surfnum >= model->nummodelsurfaces)
+               return NULL;
+       return model->surfaces + surfnum + model->firstmodelsurface;
+}
+
+
+//PF_getsurfacenumpoints, // #434 float(entity e, float s) getsurfacenumpoints = #434;
+void PF_getsurfacenumpoints(void)
+{
+       msurface_t *surf;
+       // return 0 if no such surface
+       if (!(surf = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
+       {
+               G_FLOAT(OFS_RETURN) = 0;
+               return;
+       }
+
+       G_FLOAT(OFS_RETURN) = surf->poly_numverts;
+}
+//PF_getsurfacepoint,     // #435 vector(entity e, float s, float n) getsurfacepoint = #435;
+void PF_getsurfacepoint(void)
+{
+       edict_t *ed;
+       msurface_t *surf;
+       int pointnum;
+       VectorClear(G_VECTOR(OFS_RETURN));
+       ed = G_EDICT(OFS_PARM0);
+       if (!ed || ed->e->free)
+               return;
+       if (!(surf = getsurface(ed, G_FLOAT(OFS_PARM1))))
+               return;
+       pointnum = G_FLOAT(OFS_PARM2);
+       if (pointnum < 0 || pointnum >= surf->poly_numverts)
+               return;
+       // FIXME: implement rotation/scaling
+       VectorAdd(&surf->poly_verts[pointnum * 3], ed->v->origin, G_VECTOR(OFS_RETURN));
+}
+//PF_getsurfacenormal,    // #436 vector(entity e, float s) getsurfacenormal = #436;
+void PF_getsurfacenormal(void)
+{
+       msurface_t *surf;
+       VectorClear(G_VECTOR(OFS_RETURN));
+       if (!(surf = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
+               return;
+       // FIXME: implement rotation/scaling
+       if (surf->flags & SURF_PLANEBACK)
+               VectorNegate(surf->plane->normal, G_VECTOR(OFS_RETURN));
+       else
+               VectorCopy(surf->plane->normal, G_VECTOR(OFS_RETURN));
+}
+//PF_getsurfacetexture,   // #437 string(entity e, float s) getsurfacetexture = #437;
+void PF_getsurfacetexture(void)
+{
+       msurface_t *surf;
+       G_INT(OFS_RETURN) = 0;
+       if (!(surf = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
+               return;
+       G_INT(OFS_RETURN) = PR_SetString(surf->texinfo->texture->name);
+}
+//PF_getsurfacenearpoint, // #438 float(entity e, vector p) getsurfacenearpoint = #438;
+void PF_getsurfacenearpoint(void)
+{
+       int surfnum, best, modelindex;
+       vec3_t clipped, p;
+       vec_t dist, bestdist;
+       edict_t *ed;
+       model_t *model;
+       msurface_t *surf;
+       vec_t *point;
+       G_FLOAT(OFS_RETURN) = -1;
+       ed = G_EDICT(OFS_PARM0);
+       point = G_VECTOR(OFS_PARM1);
+
+       if (!ed || ed->e->free)
+               return;
+       modelindex = ed->v->modelindex;
+       if (modelindex < 1 || modelindex >= MAX_MODELS)
+               return;
+       model = sv.models[modelindex];
+       if (model->type != mod_brush)
+               return;
+
+       // FIXME: implement rotation/scaling
+       VectorSubtract(point, ed->v->origin, p);
+       best = -1;
+       bestdist = 1000000000;
+       for (surfnum = 0;surfnum < model->nummodelsurfaces;surfnum++)
+       {
+               surf = model->surfaces + surfnum + model->firstmodelsurface;
+               dist = PlaneDiff(p, surf->plane);
+               dist = dist * dist;
+               if (dist < bestdist)
+               {
+                       clippointtosurface(surf, p, clipped);
+                       VectorSubtract(clipped, p, clipped);
+                       dist += DotProduct(clipped, clipped);
+                       if (dist < bestdist)
+                       {
+                               best = surfnum;
+                               bestdist = dist;
+                       }
+               }
+       }
+       G_FLOAT(OFS_RETURN) = best;
+}
+//PF_getsurfaceclippedpoint, // #439 vector(entity e, float s, vector p) getsurfaceclippedpoint = #439;
+void PF_getsurfaceclippedpoint(void)
+{
+       edict_t *ed;
+       msurface_t *surf;
+       vec3_t p, out;
+       VectorClear(G_VECTOR(OFS_RETURN));
+       ed = G_EDICT(OFS_PARM0);
+       if (!ed || ed->e->free)
+               return;
+       if (!(surf = getsurface(ed, G_FLOAT(OFS_PARM1))))
+               return;
+       // FIXME: implement rotation/scaling
+       VectorSubtract(G_VECTOR(OFS_PARM2), ed->v->origin, p);
+       clippointtosurface(surf, p, out);
+       // FIXME: implement rotation/scaling
+       VectorAdd(out, ed->v->origin, G_VECTOR(OFS_RETURN));
+}
+
+#define MAX_PRFILES 256
+
+qfile_t *pr_files[MAX_PRFILES];
+
+void PR_Files_Init(void)
+{
+       memset(pr_files, 0, sizeof(pr_files));
+}
+
+void PR_Files_CloseAll(void)
+{
+       int i;
+       for (i = 0;i < MAX_PRFILES;i++)
+       {
+               if (pr_files[i])
+                       FS_Close(pr_files[i]);
+               pr_files[i] = NULL;
+       }
+}
+
+//float(string s) stof = #81; // get numerical value from a string
+void PF_stof(void)
+{
+       char *s = PF_VarString(0);
+       G_FLOAT(OFS_RETURN) = atof(s);
+}
+
+//float(string filename, float mode) fopen = #110; // opens a file inside quake/gamedir/data/ (mode is FILE_READ, FILE_APPEND, or FILE_WRITE), returns fhandle >= 0 if successful, or fhandle < 0 if unable to open file for any reason
+void PF_fopen(void)
+{
+       int filenum, mode;
+       char *modestring, *filename;
+       for (filenum = 0;filenum < MAX_PRFILES;filenum++)
+               if (pr_files[filenum] == NULL)
+                       break;
+       if (filenum >= MAX_PRFILES)
+       {
+               Con_Printf("PF_fopen: ran out of file handles (%i)\n", MAX_PRFILES);
+               G_FLOAT(OFS_RETURN) = -2;
+               return;
+       }
+       mode = G_FLOAT(OFS_PARM1);
+       switch(mode)
+       {
+       case 0: // FILE_READ
+               modestring = "rb";
+               break;
+       case 1: // FILE_APPEND
+               modestring = "ab";
+               break;
+       case 2: // FILE_WRITE
+               modestring = "wb";
+               break;
+       default:
+               Con_Printf("PF_fopen: no such mode %i (valid: 0 = read, 1 = append, 2 = write)\n", mode);
+               G_FLOAT(OFS_RETURN) = -3;
+               return;
+       }
+       filename = G_STRING(OFS_PARM0);
+       // .. is parent directory on many platforms
+       // / is parent directory on Amiga
+       // : is root of drive on Amiga (also used as a directory separator on Mac, but / works there too, so that's a bad idea)
+       // \ is a windows-ism (so it's naughty to use it, / works on all platforms)
+       if ((filename[0] == '.' && filename[1] == '.') || filename[0] == '/' || strrchr(filename, ':') || strrchr(filename, '\\'))
+       {
+               Con_Printf("PF_fopen: dangerous or non-portable filename \"%s\" not allowed. (contains : or \\ or begins with .. or /)\n", filename);
+               G_FLOAT(OFS_RETURN) = -4;
+               return;
+       }
+       pr_files[filenum] = FS_Open(va("data/%s", filename), modestring, false);
+       if (pr_files[filenum] == NULL)
+               G_FLOAT(OFS_RETURN) = -1;
+       else
+               G_FLOAT(OFS_RETURN) = filenum;
+}
+
+//void(float fhandle) fclose = #111; // closes a file
+void PF_fclose(void)
+{
+       int filenum = G_FLOAT(OFS_PARM0);
+       if (filenum < 0 || filenum >= MAX_PRFILES)
+       {
+               Con_Printf("PF_fclose: invalid file handle %i\n", filenum);
+               return;
+       }
+       if (pr_files[filenum] == NULL)
+       {
+               Con_Printf("PF_fclose: no such file handle %i (or file has been closed)\n", filenum);
+               return;
+       }
+       FS_Close(pr_files[filenum]);
+       pr_files[filenum] = NULL;
+}
+
+//string(float fhandle) fgets = #112; // reads a line of text from the file and returns as a tempstring
+void PF_fgets(void)
+{
+       int c, end;
+       static char string[MAX_VARSTRING];
+       int filenum = G_FLOAT(OFS_PARM0);
+       if (filenum < 0 || filenum >= MAX_PRFILES)
+       {
+               Con_Printf("PF_fgets: invalid file handle %i\n", filenum);
+               return;
+       }
+       if (pr_files[filenum] == NULL)
+       {
+               Con_Printf("PF_fgets: no such file handle %i (or file has been closed)\n", filenum);
+               return;
+       }
+       end = 0;
+       for (;;)
+       {
+               c = FS_Getc(pr_files[filenum]);
+               if (c == '\r' || c == '\n' || c < 0)
+                       break;
+               if (end < MAX_VARSTRING - 1)
+                       string[end++] = c;
+       }
+       string[end] = 0;
+       // remove \n following \r
+       if (c == '\r')
+               c = FS_Getc(pr_files[filenum]);
+       if (developer.integer)
+               Con_Printf("fgets: %s\n", string);
+       if (c >= 0)
+               G_INT(OFS_RETURN) = PR_SetString(string);
+       else
+               G_INT(OFS_RETURN) = 0;
+}
+
+//void(float fhandle, string s) fputs = #113; // writes a line of text to the end of the file
+void PF_fputs(void)
+{
+       int stringlength;
+       char *s = PF_VarString(1);
+       int filenum = G_FLOAT(OFS_PARM0);
+       if (filenum < 0 || filenum >= MAX_PRFILES)
+       {
+               Con_Printf("PF_fputs: invalid file handle %i\n", filenum);
+               return;
+       }
+       if (pr_files[filenum] == NULL)
+       {
+               Con_Printf("PF_fputs: no such file handle %i (or file has been closed)\n", filenum);
+               return;
+       }
+       if ((stringlength = strlen(s)))
+               FS_Write(pr_files[filenum], s, stringlength);
+       if (developer.integer)
+               Con_Printf("fputs: %s\n", s);
+}
+
+//float(string s) strlen = #114; // returns how many characters are in a string
+void PF_strlen(void)
+{
+       char *s;
+       s = G_STRING(OFS_PARM0);
+       if (s)
+               G_FLOAT(OFS_RETURN) = strlen(s);
+       else
+               G_FLOAT(OFS_RETURN) = 0;
+}
+
+//string(string s1, string s2) strcat = #115; // concatenates two strings (for example "abc", "def" would return "abcdef") and returns as a tempstring
+void PF_strcat(void)
+{
+       char *s = PF_VarString(0);
+       G_INT(OFS_RETURN) = PR_SetString(s);
+}
+
+//string(string s, float start, float length) substring = #116; // returns a section of a string as a tempstring
+void PF_substring(void)
+{
+       int i, start, end;
+       char *s, string[MAX_VARSTRING];
+       s = G_STRING(OFS_PARM0);
+       start = G_FLOAT(OFS_PARM1);
+       end = G_FLOAT(OFS_PARM2) + start;
+       if (!s)
+               s = "";
+       for (i = 0;i < start && *s;i++, s++);
+       for (i = 0;i < MAX_VARSTRING - 1 && *s && i < end;i++, s++)
+               string[i] = *s;
+       string[i] = 0;
+       G_INT(OFS_RETURN) = PR_SetString(string);
+}
+
+//vector(string s) stov = #117; // returns vector value from a string
+void PF_stov(void)
+{
+       Math_atov(PF_VarString(0), G_VECTOR(OFS_RETURN));
+}
+
+//string(string s) strzone = #118; // makes a copy of a string into the string zone and returns it, this is often used to keep around a tempstring for longer periods of time (tempstrings are replaced often)
+void PF_strzone(void)
+{
+       char *in, *out;
+       in = G_STRING(OFS_PARM0);
+       out = Mem_Alloc(pr_strings_mempool, strlen(in) + 1);
+       strcpy(out, in);
+       G_INT(OFS_RETURN) = PR_SetString(out);
+}
+
+//void(string s) strunzone = #119; // removes a copy of a string from the string zone (you can not use that string again or it may crash!!!)
+void PF_strunzone(void)
+{
+       Mem_Free(G_STRING(OFS_PARM0));
+}
+
+//void(entity e, string s) clientcommand = #440; // executes a command string as if it came from the specified client
+//this function originally written by KrimZon, made shorter by LordHavoc
+void PF_clientcommand (void)
+{
+       client_t *temp_client;
+       int i;
+
+       //find client for this entity
+       i = (NUM_FOR_EDICT(G_EDICT(OFS_PARM0)) - 1);
+       if (i < 0 || i >= svs.maxclients)
+               Host_Error("PF_clientcommand: entity is not a client");
+
+       temp_client = host_client;
+       host_client = &svs.clients[i];
+       Cmd_ExecuteString (G_STRING(OFS_PARM1), src_client);
+       host_client = temp_client;
+}
+
+//float(string s) tokenize = #441; // takes apart a string into individal words (access them with argv), returns how many
+//this function originally written by KrimZon, made shorter by LordHavoc
+char **tokens = NULL;
+int    max_tokens, num_tokens = 0;
+void PF_tokenize (void)
+{
+       const char *p;
+       char *str;
+       str = G_STRING(OFS_PARM0);
+
+       if (tokens != NULL)
+       {
+               int i;
+               for (i=0;i<num_tokens;i++)
+                       Z_Free(tokens[i]);
+               Z_Free(tokens);
+               num_tokens = 0;
+       }
+
+       tokens = Z_Malloc(strlen(str) * sizeof(char *));
+       max_tokens = strlen(str);
+
+       for (p = str;COM_ParseToken(&p) && num_tokens < max_tokens;num_tokens++)
+       {
+               tokens[num_tokens] = Z_Malloc(strlen(com_token) + 1);
+               strcpy(tokens[num_tokens], com_token);
+       }
+
+       G_FLOAT(OFS_RETURN) = num_tokens;
+}
+
+//string(float n) argv = #442; // returns a word from the tokenized string (returns nothing for an invalid index)
+//this function originally written by KrimZon, made shorter by LordHavoc
+void PF_argv (void)
+{
+       int token_num = G_FLOAT(OFS_PARM0);
+       if (token_num >= 0 && token_num < num_tokens)
+               G_INT(OFS_RETURN) = PR_SetString(tokens[token_num]);
+       else
+               G_INT(OFS_RETURN) = PR_SetString("");
+}
 
 
 builtin_t pr_builtin[] =
 {
-PF_Fixme,
-PF_makevectors,        // void(entity e)       makevectors             = #1;
-PF_setorigin,  // void(entity e, vector o) setorigin   = #2;
-PF_setmodel,   // void(entity e, string m) setmodel    = #3;
-PF_setsize,    // void(entity e, vector min, vector max) setsize = #4;
-PF_Fixme,      // void(entity e, vector min, vector max) setabssize = #5;
-PF_break,      // void() break                                         = #6;
-PF_random,     // float() random                                               = #7;
-PF_sound,      // void(entity e, float chan, string samp) sound = #8;
-PF_normalize,  // vector(vector v) normalize                   = #9;
-PF_error,      // void(string e) error                         = #10;
-PF_objerror,   // void(string e) objerror                              = #11;
-PF_vlen,       // float(vector v) vlen                         = #12;
-PF_vectoyaw,   // float(vector v) vectoyaw             = #13;
-PF_Spawn,      // entity() spawn                                               = #14;
-PF_Remove,     // void(entity e) remove                                = #15;
-PF_traceline,  // float(vector v1, vector v2, float tryents) traceline = #16;
-PF_checkclient,        // entity() clientlist                                  = #17;
-PF_Find,       // entity(entity start, .string fld, string match) find = #18;
-PF_precache_sound,     // void(string s) precache_sound                = #19;
-PF_precache_model,     // void(string s) precache_model                = #20;
-PF_stuffcmd,   // void(entity client, string s)stuffcmd = #21;
-PF_findradius, // entity(vector org, float rad) findradius = #22;
-PF_bprint,     // void(string s) bprint                                = #23;
-PF_sprint,     // void(entity client, string s) sprint = #24;
-PF_dprint,     // void(string s) dprint                                = #25;
-PF_ftos,       // void(string s) ftos                          = #26;
-PF_vtos,       // void(string s) vtos                          = #27;
-PF_coredump,
-PF_traceon,
-PF_traceoff,
-PF_eprint,     // void(entity e) debug print an entire entity
-PF_walkmove, // float(float yaw, float dist) walkmove
-PF_Fixme, // float(float yaw, float dist) walkmove
-PF_droptofloor,
-PF_lightstyle,
-PF_rint,
-PF_floor,
-PF_ceil,
-PF_Fixme,
-PF_checkbottom,
-PF_pointcontents,
-PF_Fixme,
-PF_fabs,
-PF_aim,
-PF_cvar,
-PF_localcmd,
-PF_nextent,
-PF_particle,
-PF_changeyaw,
-PF_Fixme,
-PF_vectoangles,
-
-PF_WriteByte,
-PF_WriteChar,
-PF_WriteShort,
-PF_WriteLong,
-PF_WriteCoord,
-PF_WriteAngle,
-PF_WriteString,
-PF_WriteEntity,
-
-PF_sin,
-PF_cos,
-PF_sqrt,
-PF_changepitch,
-PF_TraceToss,
-PF_etos,
-PF_Fixme,
-
-SV_MoveToGoal,
-PF_precache_file,
-PF_makestatic,
-
-PF_changelevel,
-PF_Fixme,
-
-PF_cvar_set,
-PF_centerprint,
-
-PF_ambientsound,
-
-PF_precache_model,
-PF_precache_sound,             // precache_sound2 is different only for qcc
-PF_precache_file,
-
-PF_setspawnparms,
-
-PF_Fixme,                      // #79 LordHavoc: dunno who owns 79-89, so these are just padding
-PF_Fixme,                      // #80 
-PF_Fixme,                      // #81
-PF_Fixme,                      // #82
-PF_Fixme,                      // #83
-PF_Fixme,                      // #84
-PF_Fixme,                      // #85
-PF_Fixme,                      // #86
-PF_Fixme,                      // #87
-PF_Fixme,                      // #88
-PF_Fixme,                      // #89
-
-PF_tracebox,           // #90 LordHavoc builtin range (9x)
-PF_randomvec,          // #91
-PF_GetLight,           // #92
-PF_registercvar,       // #93
-PF_min,                                // #94
-PF_max,                                // #95
-PF_bound,                      // #96
-PF_pow,                                // #97
-PF_FindFloat,          // #98
-PF_checkextension,     // #99
-#define a PF_Fixme, PF_Fixme, PF_Fixme, PF_Fixme, PF_Fixme, PF_Fixme, PF_Fixme, PF_Fixme, PF_Fixme, PF_Fixme,
-#define aa a a a a a a a a a a
-aa // #200
-aa // #300
-aa // #400
-PF_copyentity,         // #400 LordHavoc: builtin range (4xx)
-PF_setcolor,           // #401
+NULL,                                          // #0
+PF_makevectors,                                // #1 void(entity e) makevectors
+PF_setorigin,                          // #2 void(entity e, vector o) setorigin
+PF_setmodel,                           // #3 void(entity e, string m) setmodel
+PF_setsize,                                    // #4 void(entity e, vector min, vector max) setsize
+NULL,                                          // #5 void(entity e, vector min, vector max) setabssize
+PF_break,                                      // #6 void() break
+PF_random,                                     // #7 float() random
+PF_sound,                                      // #8 void(entity e, float chan, string samp) sound
+PF_normalize,                          // #9 vector(vector v) normalize
+PF_error,                                      // #10 void(string e) error
+PF_objerror,                           // #11 void(string e) objerror
+PF_vlen,                                       // #12 float(vector v) vlen
+PF_vectoyaw,                           // #13 float(vector v) vectoyaw
+PF_Spawn,                                      // #14 entity() spawn
+PF_Remove,                                     // #15 void(entity e) remove
+PF_traceline,                          // #16 float(vector v1, vector v2, float tryents) traceline
+PF_checkclient,                                // #17 entity() clientlist
+PF_Find,                                       // #18 entity(entity start, .string fld, string match) find
+PF_precache_sound,                     // #19 void(string s) precache_sound
+PF_precache_model,                     // #20 void(string s) precache_model
+PF_stuffcmd,                           // #21 void(entity client, string s)stuffcmd
+PF_findradius,                         // #22 entity(vector org, float rad) findradius
+PF_bprint,                                     // #23 void(string s) bprint
+PF_sprint,                                     // #24 void(entity client, string s) sprint
+PF_dprint,                                     // #25 void(string s) dprint
+PF_ftos,                                       // #26 void(string s) ftos
+PF_vtos,                                       // #27 void(string s) vtos
+PF_coredump,                           // #28 void() coredump
+PF_traceon,                                    // #29 void() traceon
+PF_traceoff,                           // #30 void() traceoff
+PF_eprint,                                     // #31 void(entity e) eprint
+PF_walkmove,                           // #32 float(float yaw, float dist) walkmove
+NULL,                                          // #33
+PF_droptofloor,                                // #34 float() droptofloor
+PF_lightstyle,                         // #35 void(float style, string value) lightstyle
+PF_rint,                                       // #36 float(float v) rint
+PF_floor,                                      // #37 float(float v) floor
+PF_ceil,                                       // #38 float(float v) ceil
+NULL,                                          // #39
+PF_checkbottom,                                // #40 float(entity e) checkbottom
+PF_pointcontents               ,       // #41 float(vector v) pointcontents
+NULL,                                          // #42
+PF_fabs,                                       // #43 float(float f) fabs
+PF_aim,                                                // #44 vector(entity e, float speed) aim
+PF_cvar,                                       // #45 float(string s) cvar
+PF_localcmd,                           // #46 void(string s) localcmd
+PF_nextent,                                    // #47 entity(entity e) nextent
+PF_particle,                           // #48 void(vector o, vector d, float color, float count) particle
+PF_changeyaw,                          // #49 void() ChangeYaw
+NULL,                                          // #50
+PF_vectoangles,                                // #51 vector(vector v) vectoangles
+PF_WriteByte,                          // #52 void(float to, float f) WriteByte
+PF_WriteChar,                          // #53 void(float to, float f) WriteChar
+PF_WriteShort,                         // #54 void(float to, float f) WriteShort
+PF_WriteLong,                          // #55 void(float to, float f) WriteLong
+PF_WriteCoord,                         // #56 void(float to, float f) WriteCoord
+PF_WriteAngle,                         // #57 void(float to, float f) WriteAngle
+PF_WriteString,                                // #58 void(float to, string s) WriteString
+PF_WriteEntity,                                // #59 void(float to, entity e) WriteEntity
+PF_sin,                                                // #60 float(float f) sin (DP_QC_SINCOSSQRTPOW)
+PF_cos,                                                // #61 float(float f) cos (DP_QC_SINCOSSQRTPOW)
+PF_sqrt,                                       // #62 float(float f) sqrt (DP_QC_SINCOSSQRTPOW)
+PF_changepitch,                                // #63 void(entity ent) changepitch (DP_QC_CHANGEPITCH)
+PF_TraceToss,                          // #64 void(entity e, entity ignore) tracetoss (DP_QC_TRACETOSS)
+PF_etos,                                       // #65 string(entity ent) etos (DP_QC_ETOS)
+NULL,                                          // #66
+SV_MoveToGoal,                         // #67 void(float step) movetogoal
+PF_precache_file,                      // #68 string(string s) precache_file
+PF_makestatic,                         // #69 void(entity e) makestatic
+PF_changelevel,                                // #70 void(string s) changelevel
+NULL,                                          // #71
+PF_cvar_set,                           // #72 void(string var, string val) cvar_set
+PF_centerprint,                                // #73 void(entity client, strings) centerprint
+PF_ambientsound,                       // #74 void(vector pos, string samp, float vol, float atten) ambientsound
+PF_precache_model,                     // #75 string(string s) precache_model2
+PF_precache_sound,                     // #76 string(string s) precache_sound2
+PF_precache_file,                      // #77 string(string s) precache_file2
+PF_setspawnparms,                      // #78 void(entity e) setspawnparms
+NULL,                                          // #79
+NULL,                                          // #80
+PF_stof,                                       // #81 float(string s) stof (FRIK_FILE)
+NULL,                                          // #82
+NULL,                                          // #83
+NULL,                                          // #84
+NULL,                                          // #85
+NULL,                                          // #86
+NULL,                                          // #87
+NULL,                                          // #88
+NULL,                                          // #89
+PF_tracebox,                           // #90 void(vector v1, vector min, vector max, vector v2, float nomonsters, entity forent) tracebox (DP_QC_TRACEBOX)
+PF_randomvec,                          // #91 vector() randomvec (DP_QC_RANDOMVEC)
+PF_GetLight,                           // #92 vector(vector org) getlight (DP_QC_GETLIGHT)
+PF_registercvar,                       // #93 float(string name, string value) registercvar (DP_REGISTERCVAR)
+PF_min,                                                // #94 float(float a, floats) min (DP_QC_MINMAXBOUND)
+PF_max,                                                // #95 float(float a, floats) max (DP_QC_MINMAXBOUND)
+PF_bound,                                      // #96 float(float minimum, float val, float maximum) bound (DP_QC_MINMAXBOUND)
+PF_pow,                                                // #97 float(float f, float f) pow (DP_QC_SINCOSSQRTPOW)
+PF_FindFloat,                          // #98 entity(entity start, .float fld, float match) findfloat (DP_QC_FINDFLOAT)
+PF_checkextension,                     // #99 float(string s) checkextension (the basis of the extension system)
+NULL,                                          // #100
+NULL,                                          // #101
+NULL,                                          // #102
+NULL,                                          // #103
+NULL,                                          // #104
+NULL,                                          // #105
+NULL,                                          // #106
+NULL,                                          // #107
+NULL,                                          // #108
+NULL,                                          // #109
+PF_fopen,                                      // #110 float(string filename, float mode) fopen (FRIK_FILE)
+PF_fclose,                                     // #111 void(float fhandle) fclose (FRIK_FILE)
+PF_fgets,                                      // #112 string(float fhandle) fgets (FRIK_FILE)
+PF_fputs,                                      // #113 void(float fhandle, string s) fputs (FRIK_FILE)
+PF_strlen,                                     // #114 float(string s) strlen (FRIK_FILE)
+PF_strcat,                                     // #115 string(string s1, string s2) strcat (FRIK_FILE)
+PF_substring,                          // #116 string(string s, float start, float length) substring (FRIK_FILE)
+PF_stov,                                       // #117 vector(string) stov (FRIK_FILE)
+PF_strzone,                                    // #118 string(string s) strzone (FRIK_FILE)
+PF_strunzone,                          // #119 void(string s) strunzone (FRIK_FILE)
+#define a NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+a a a a a a a a                                // #120-199
+a a a a a a a a a a                    // #200-299
+a a a a a a a a a a                    // #300-399
+PF_copyentity,                         // #400 void(entity from, entity to) copyentity (DP_QC_COPYENTITY)
+PF_setcolor,                           // #401 void(entity ent, float colors) setcolor (DP_QC_SETCOLOR)
+PF_findchain,                          // #402 entity(.string fld, string match) findchain (DP_QC_FINDCHAIN)
+PF_findchainfloat,                     // #403 entity(.float fld, float match) findchainfloat (DP_QC_FINDCHAINFLOAT)
+PF_effect,                                     // #404 void(vector org, string modelname, float startframe, float endframe, float framerate) effect (DP_SV_EFFECT)
+PF_te_blood,                           // #405 void(vector org, vector velocity, float howmany) te_blood (DP_TE_BLOOD)
+PF_te_bloodshower,                     // #406 void(vector mincorner, vector maxcorner, float explosionspeed, float howmany) te_bloodshower (DP_TE_BLOODSHOWER)
+PF_te_explosionrgb,                    // #407 void(vector org, vector color) te_explosionrgb (DP_TE_EXPLOSIONRGB)
+PF_te_particlecube,                    // #408 void(vector mincorner, vector maxcorner, vector vel, float howmany, float color, float gravityflag, float randomveljitter) te_particlecube (DP_TE_PARTICLECUBE)
+PF_te_particlerain,                    // #409 void(vector mincorner, vector maxcorner, vector vel, float howmany, float color) te_particlerain (DP_TE_PARTICLERAIN)
+PF_te_particlesnow,                    // #410 void(vector mincorner, vector maxcorner, vector vel, float howmany, float color) te_particlesnow (DP_TE_PARTICLESNOW)
+PF_te_spark,                           // #411 void(vector org, vector vel, float howmany) te_spark (DP_TE_SPARK)
+PF_te_gunshotquad,                     // #412 void(vector org) te_gunshotquad (DP_QUADEFFECTS1)
+PF_te_spikequad,                       // #413 void(vector org) te_spikequad (DP_QUADEFFECTS1)
+PF_te_superspikequad,          // #414 void(vector org) te_superspikequad (DP_QUADEFFECTS1)
+PF_te_explosionquad,           // #415 void(vector org) te_explosionquad (DP_QUADEFFECTS1)
+PF_te_smallflash,                      // #416 void(vector org) te_smallflash (DP_TE_SMALLFLASH)
+PF_te_customflash,                     // #417 void(vector org, float radius, float lifetime, vector color) te_customflash (DP_TE_CUSTOMFLASH)
+PF_te_gunshot,                         // #418 void(vector org) te_gunshot (DP_TE_STANDARDEFFECTBUILTINS)
+PF_te_spike,                           // #419 void(vector org) te_spike (DP_TE_STANDARDEFFECTBUILTINS)
+PF_te_superspike,                      // #420 void(vector org) te_superspike (DP_TE_STANDARDEFFECTBUILTINS)
+PF_te_explosion,                       // #421 void(vector org) te_explosion (DP_TE_STANDARDEFFECTBUILTINS)
+PF_te_tarexplosion,                    // #422 void(vector org) te_tarexplosion (DP_TE_STANDARDEFFECTBUILTINS)
+PF_te_wizspike,                                // #423 void(vector org) te_wizspike (DP_TE_STANDARDEFFECTBUILTINS)
+PF_te_knightspike,                     // #424 void(vector org) te_knightspike (DP_TE_STANDARDEFFECTBUILTINS)
+PF_te_lavasplash,                      // #425 void(vector org) te_lavasplash (DP_TE_STANDARDEFFECTBUILTINS)
+PF_te_teleport,                                // #426 void(vector org) te_teleport (DP_TE_STANDARDEFFECTBUILTINS)
+PF_te_explosion2,                      // #427 void(vector org, float color) te_explosion2 (DP_TE_STANDARDEFFECTBUILTINS)
+PF_te_lightning1,                      // #428 void(entity own, vector start, vector end) te_lightning1 (DP_TE_STANDARDEFFECTBUILTINS)
+PF_te_lightning2,                      // #429 void(entity own, vector start, vector end) te_lightning2 (DP_TE_STANDARDEFFECTBUILTINS)
+PF_te_lightning3,                      // #430 void(entity own, vector start, vector end) te_lightning3 (DP_TE_STANDARDEFFECTBUILTINS)
+PF_te_beam,                                    // #431 void(entity own, vector start, vector end) te_beam (DP_TE_STANDARDEFFECTBUILTINS)
+PF_vectorvectors,                      // #432 void(vector dir) vectorvectors (DP_QC_VECTORVECTORS)
+PF_te_plasmaburn,                      // #433 void(vector org) te_plasmaburn (DP_TE_PLASMABURN)
+PF_getsurfacenumpoints,                // #434 float(entity e, float s) getsurfacenumpoints (DP_QC_GETSURFACE)
+PF_getsurfacepoint,                    // #435 vector(entity e, float s, float n) getsurfacepoint (DP_QC_GETSURFACE)
+PF_getsurfacenormal,           // #436 vector(entity e, float s) getsurfacenormal (DP_QC_GETSURFACE)
+PF_getsurfacetexture,          // #437 string(entity e, float s) getsurfacetexture (DP_QC_GETSURFACE)
+PF_getsurfacenearpoint,                // #438 float(entity e, vector p) getsurfacenearpoint (DP_QC_GETSURFACE)
+PF_getsurfaceclippedpoint,     // #439 vector(entity e, float s, vector p) getsurfaceclippedpoint (DP_QC_GETSURFACE)
+PF_clientcommand,                      // #440 void(entity e, string s) clientcommand (KRIMZON_SV_PARSECLIENTCOMMAND)
+PF_tokenize,                           // #441 float(string s) tokenize (KRIMZON_SV_PARSECLIENTCOMMAND)
+PF_argv,                                       // #442 string(float n) argv (KRIMZON_SV_PARSECLIENTCOMMAND)
+NULL,                                          // #443
+NULL,                                          // #444
+NULL,                                          // #445
+NULL,                                          // #446
+NULL,                                          // #447
+NULL,                                          // #448
+NULL,                                          // #449
+a a a a a                                      // #450-499 (LordHavoc)
 };
 
 builtin_t *pr_builtins = pr_builtin;
 int pr_numbuiltins = sizeof(pr_builtin)/sizeof(pr_builtin[0]);
 
+void PR_Cmd_Init(void)
+{
+       pr_strings_mempool = Mem_AllocPool("pr_stringszone");
+       PR_Files_Init();
+}
+
+void PR_Cmd_Reset(void)
+{
+       Mem_EmptyPool(pr_strings_mempool);
+       PR_Files_CloseAll();
+}
+