added SV_EntitiesInBox function to find entities within a box, merging the box testin...

[xonotic/darkplaces.git] / pr_cmds.c

diff --git a/pr_cmds.c b/pr_cmds.c
index 32fe4cf7b15177565993092ed1b698e7689617f4..15efae181cf695091deedaa783179310bdd4371d 100644 (file)
--- a/pr_cmds.c
+++ b/pr_cmds.c
@@ -75,6 +75,7 @@ char *ENGINE_EXTENSIONS =
 "DP_EF_BLUE "
 "DP_EF_FLAME "
 "DP_EF_FULLBRIGHT "
+"DP_EF_NODEPTHTEST "
 "DP_EF_NODRAW "
 "DP_EF_NOSHADOW "
 "DP_EF_RED "
@@ -153,6 +154,7 @@ char *ENGINE_EXTENSIONS =
 "KRIMZON_SV_PARSECLIENTCOMMAND "
 "NEH_CMD_PLAY2 "
 "NEH_RESTOREGAME "
+"NXQ_GFX_LETTERBOX "
 "TENEBRAE_GFX_DLIGHTS "
 "TW_SV_STEPCONTROL "
 ;
@@ -522,7 +524,7 @@ void PF_vectoyaw (void)
                yaw = 0;
        else
        {
-               yaw = (int) (atan2(value1[1], value1[0]) * 180 / M_PI);
+               yaw = (atan2(value1[1], value1[0]) * 180 / M_PI);
                if (yaw < 0)
                        yaw += 360;
        }
@@ -540,11 +542,9 @@ vector vectoangles(vector)
 */
 void PF_vectoangles (void)
 {
-       float   *value1;
-       float   forward;
-       float   yaw, pitch;
+       double value1[3], forward, yaw, pitch;
 
-       value1 = G_VECTOR(OFS_PARM0);
+       VectorCopy(G_VECTOR(OFS_PARM0), value1);
 
        if (value1[1] == 0 && value1[0] == 0)
        {
@@ -569,14 +569,12 @@ void PF_vectoangles (void)
                        yaw = 270;
 
                forward = sqrt(value1[0]*value1[0] + value1[1]*value1[1]);
-               pitch = (int) (atan2(value1[2], forward) * 180 / M_PI);
+               pitch = (atan2(value1[2], forward) * 180 / M_PI);
                if (pitch < 0)
                        pitch += 360;
        }
 
-       G_FLOAT(OFS_RETURN+0) = pitch;
-       G_FLOAT(OFS_RETURN+1) = yaw;
-       G_FLOAT(OFS_RETURN+2) = 0;
+       VectorSet(G_VECTOR(OFS_RETURN), pitch, yaw, 0);
 }
 
 /*
@@ -1033,37 +1031,46 @@ findradius (origin, radius)
 void PF_findradius (void)
 {
        edict_t *ent, *chain;
-       float radius;
-       float radius2;
-       float *org;
-       float eorg[3];
+       vec_t radius, radius2;
+       vec3_t org, eorg, mins, maxs;
        int i;
+       int numtouchedicts;
+       edict_t *touchedicts[MAX_EDICTS];
 
        chain = (edict_t *)sv.edicts;
 
-       org = G_VECTOR(OFS_PARM0);
+       VectorCopy(G_VECTOR(OFS_PARM0), org);
        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))
+       mins[0] = org[0] - radius;
+       mins[1] = org[1] - radius;
+       mins[2] = org[2] - radius;
+       maxs[0] = org[0] + radius;
+       maxs[1] = org[1] + radius;
+       maxs[2] = org[2] + radius;
+       numtouchedicts = SV_EntitiesInBox(mins, maxs, MAX_EDICTS, touchedicts);
+       if (numtouchedicts > MAX_EDICTS)
        {
+               // this never happens
+               Con_Printf("SV_EntitiesInBox returned %i edicts, max was %i\n", numtouchedicts, MAX_EDICTS);
+               numtouchedicts = MAX_EDICTS;
+       }
+       for (i = 0;i < numtouchedicts;i++)
+       {
+               ent = touchedicts[i];
                pr_xfunction->builtinsprofile++;
-               if (ent->e->free)
-                       continue;
-               if (ent->v->solid == SOLID_NOT)
-                       continue;
-
-               // LordHavoc: compare against bounding box rather than center,
-               // and use DotProduct instead of Length, major speedup
+               // LordHavoc: compare against bounding box rather than center so it
+               // doesn't miss large objects, and use DotProduct instead of Length
+               // for a 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);
-               chain = ent;
+               if (DotProduct(eorg, eorg) < radius2)
+               {
+                       ent->v->chain = EDICT_TO_PROG(chain);
+                       chain = ent;
+               }
        }
 
        RETURN_EDICT(chain);
@@ -1632,7 +1639,10 @@ void PF_aim (void)
        float   speed;
 
        // assume failure if it returns early
-       VectorClear(G_VECTOR(OFS_RETURN));
+       VectorCopy(pr_global_struct->v_forward, G_VECTOR(OFS_RETURN));
+       // if sv_aim is so high it can't possibly accept anything, skip out early
+       if (sv_aim.value >= 1)
+               return;
 
        ent = G_EDICT(OFS_PARM0);
        if (ent == sv.edicts)
@@ -1877,10 +1887,7 @@ void PF_WriteLong (void)
 
 void PF_WriteAngle (void)
 {
-       if (sv.protocol == PROTOCOL_DARKPLACES5)
-               MSG_WriteAngle16i (WriteDest(), G_FLOAT(OFS_PARM1));
-       else
-               MSG_WriteAngle8i (WriteDest(), G_FLOAT(OFS_PARM1));
+       MSG_WriteAngle (WriteDest(), G_FLOAT(OFS_PARM1), sv.protocol);
 }
 
 void PF_WriteCoord (void)
@@ -1934,7 +1941,7 @@ void PF_makestatic (void)
        for (i=0 ; i<3 ; i++)
        {
                MSG_WriteCoord(&sv.signon, ent->v->origin[i], sv.protocol);
-               MSG_WriteAngle8i(&sv.signon, ent->v->angles[i]);
+               MSG_WriteAngle(&sv.signon, ent->v->angles[i], sv.protocol);
        }
 
 // throw the entity away now
@@ -2048,17 +2055,13 @@ void PF_GetLight (void)
        VectorMA(ambientcolor, 0.5, diffusecolor, G_VECTOR(OFS_RETURN));
 }
 
-#define MAX_QC_CVARS 128
-cvar_t qc_cvar[MAX_QC_CVARS];
-int currentqc_cvar;
-
 void PF_registercvar (void)
 {
        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 already been defined
        if (Cvar_FindVar (name))
                return;
@@ -2070,18 +2073,8 @@ void PF_registercvar (void)
                return;
        }
 
-       if (currentqc_cvar >= MAX_QC_CVARS)
-               PF_ERROR("PF_registercvar: ran out of cvar slots\n");
+       Cvar_Get(name, value, 0);
 
-// copy the name and value
-       variable = &qc_cvar[currentqc_cvar++];
-       variable->name = Z_Malloc (strlen(name)+1);
-       strcpy (variable->name, name);
-       variable->string = Z_Malloc (strlen(value)+1);
-       strcpy (variable->string, value);
-       variable->value = atof (value);
-
-       Cvar_RegisterVariable(variable);
        G_FLOAT(OFS_RETURN) = 1; // success
 }
 
@@ -3297,10 +3290,13 @@ void PF_cvar_string (void)
 
        str = G_STRING(OFS_PARM0);
        var = Cvar_FindVar (str);
-
-       tmp = PR_GetTempString();
-       strcpy(tmp, var->string);
-
+       if (var)
+       {
+               tmp = PR_GetTempString();
+               strcpy(tmp, var->string);
+       }
+       else
+               tmp = "";
        G_INT(OFS_RETURN) = PR_SetString(tmp);
 }