added sv_gameplayfix_blowupfallenzombies and sv_gameplayfix_findradiusdistancetobox...

[xonotic/darkplaces.git] / pr_cmds.c

diff --git a/pr_cmds.c b/pr_cmds.c
index dd9ca8ef6451dbba5e090eb7907bf46b6592eadb..b1be56e378c0be173ff324029b887a4f010fc61e 100644 (file)
--- a/pr_cmds.c
+++ b/pr_cmds.c
@@ -23,8 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 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;
-
 // LordHavoc: added this to semi-fix the problem of using many ftos calls in a print
 #define STRINGTEMP_BUFFERS 16
 #define STRINGTEMP_LENGTH 4096
@@ -99,6 +97,7 @@ char *ENGINE_EXTENSIONS =
 "DP_GFX_SKYBOX "
 "DP_HALFLIFE_MAP "
 "DP_HALFLIFE_MAP_CVAR "
+"DP_HALFLIFE_SPRITE "
 "DP_INPUTBUTTONS "
 "DP_LITSPRITES "
 "DP_LITSUPPORT "
@@ -1040,12 +1039,12 @@ void PF_findradius (void)
        radius = G_FLOAT(OFS_PARM1);
        radius2 = radius * radius;
 
-       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;
+       mins[0] = org[0] - (radius + 1);
+       mins[1] = org[1] - (radius + 1);
+       mins[2] = org[2] - (radius + 1);
+       maxs[0] = org[0] + (radius + 1);
+       maxs[1] = org[1] + (radius + 1);
+       maxs[2] = org[2] + (radius + 1);
        numtouchedicts = SV_EntitiesInBox(mins, maxs, MAX_EDICTS, touchedicts);
        if (numtouchedicts > MAX_EDICTS)
        {
@@ -1057,12 +1056,22 @@ void PF_findradius (void)
        {
                ent = touchedicts[i];
                pr_xfunction->builtinsprofile++;
+               // Quake did not return non-solid entities but darkplaces does
+               // (note: this is the reason you can't blow up fallen zombies)
+               if (ent->v->solid == SOLID_NOT && !sv_gameplayfix_blowupfallenzombies.integer)
+                       continue;
                // 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]);
+               VectorSubtract(org, ent->v->origin, eorg);
+               if (sv_gameplayfix_findradiusdistancetobox.integer)
+               {
+                       eorg[0] -= bound(ent->v->mins[0], eorg[0], ent->v->maxs[0]);
+                       eorg[1] -= bound(ent->v->mins[1], eorg[1], ent->v->maxs[1]);
+                       eorg[2] -= bound(ent->v->mins[2], eorg[2], ent->v->maxs[2]);
+               }
+               else
+                       VectorMAMAM(1, eorg, 0.5f, ent->v->mins, 0.5f, ent->v->maxs, eorg);
                if (DotProduct(eorg, eorg) < radius2)
                {
                        ent->v->chain = EDICT_TO_PROG(chain);
@@ -2418,7 +2427,7 @@ void PF_te_customflash (void)
        // 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));
+       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));
@@ -2984,7 +2993,7 @@ void PF_strzone(void)
 {
        char *in, *out;
        in = G_STRING(OFS_PARM0);
-       out = Mem_Alloc(pr_strings_mempool, strlen(in) + 1);
+       out = PR_Alloc(strlen(in) + 1);
        strcpy(out, in);
        G_INT(OFS_RETURN) = PR_SetString(out);
 }
@@ -2992,7 +3001,7 @@ void PF_strzone(void)
 //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));
+       PR_Free(G_STRING(OFS_PARM0));
 }
 
 //void(entity e, string s) clientcommand = #440; // executes a command string as if it came from the specified client
@@ -3718,19 +3727,16 @@ int pr_numbuiltins = sizeof(pr_builtin)/sizeof(pr_builtin[0]);
 
 void PR_Cmd_Init(void)
 {
-       pr_strings_mempool = Mem_AllocPool("pr_stringszone", 0, NULL);
        PR_Files_Init();
        PR_Search_Init();
 }
 
 void PR_Cmd_Shutdown(void)
 {
-       Mem_FreePool (&pr_strings_mempool);
 }
 
 void PR_Cmd_Reset(void)
 {
-       Mem_EmptyPool(pr_strings_mempool);
        PR_Search_Reset();
        PR_Files_CloseAll();
 }