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, check = sv.model_precache ; *check ; i++, check++)
if (!strcmp(*check, m))
break;
-
+
if (!*check)
PR_RunError ("no precache: %s\n", m);
-
+
e->v.model = m - pr_strings;
e->v.modelindex = i; //SV_ModelIndex (m);
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
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);
}
for (soundnum=0, check = sv.sound_precache ; *check ; check++, soundnum++)
if (!strcmp(*check,samp))
break;
-
+
if (!*check)
{
Con_Printf ("no precache: %s\n", samp);
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;
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
}
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;
void PF_localcmd (void)
{
char *str;
-
+
str = G_STRING(OFS_PARM0);
Cbuf_AddText (str);
}
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);
- // LordHavoc: ftos improvement
- sprintf (pr_string_temp, "%g", v);
+ s = PR_GetTempString();
/*
if (v == (int)v)
- sprintf (pr_string_temp, "%d",(int)v);
+ sprintf (s, "%d",(int)v);
else
- sprintf (pr_string_temp, "%5.1f",v);
+ sprintf (s, "%5.1f",v);
*/
- G_INT(OFS_RETURN) = pr_string_temp - pr_strings;
+ // LordHavoc: ftos improvement
+ sprintf (s, "%g", v);
+ G_INT(OFS_RETURN) = s - pr_strings;
}
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) = s - pr_strings;
}
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) = s - pr_strings;
}
void PF_Spawn (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;
RETURN_EDICT(sv.edicts);
return;
}
-
+
for (e++ ; e < sv.num_edicts ; e++)
{
ed = EDICT_NUM(e);
PR_RunError ("PF_Precache_*: Precache can only be done in spawn functions");
s = G_STRING(OFS_PARM0);
- if (hlbsp && ((!s) || (!s[0])))
+ if (sv.worldmodel->ishlbsp && ((!s) || (!s[0])))
return;
G_INT(OFS_RETURN) = G_INT(OFS_PARM0);
PR_CheckEmptyString (s);
if (!sv.model_precache[i])
{
sv.model_precache[i] = s;
- sv.models[i] = Mod_ForName (s, true);
+ sv.models[i] = Mod_ForName (s, true, false, false);
return;
}
if (!strcmp(sv.model_precache[i], s))
VectorCopy (ent->v.origin, end);
end[2] -= 256;
- trace = SV_Move (ent->v.origin, ent->v.mins, ent->v.maxs, end, false, ent);
+ trace = SV_Move (ent->v.origin, ent->v.mins, ent->v.maxs, end, MOVE_NORMAL, ent);
if (trace.fraction == 1 || trace.allsolid)
G_FLOAT(OFS_RETURN) = 0;
// 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);
+ tr = SV_Move (start, vec3_origin, vec3_origin, end, MOVE_NORMAL, ent);
if (tr.ent && tr.ent->v.takedamage == DAMAGE_AIM
- && (!teamplay.value || ent->v.team <=0 || ent->v.team != tr.ent->v.team) )
+ && (!teamplay.integer || ent->v.team <=0 || ent->v.team != tr.ent->v.team) )
{
VectorCopy (pr_global_struct->v_forward, G_VECTOR(OFS_RETURN));
return;
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]
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;
projects / xonotic / darkplaces.git / blobdiff