*/
-char *PF_VarString (int first)
+char *PF_VarString (int first)
{
- int i, j, end;
- char *s;
+ int i;
+ const char *s;
+ char *out, *outend;
- end = 0;
- for (i = first;i < pr_argc;i++)
+ out = pr_varstring_temp;
+ outend = pr_varstring_temp + sizeof(pr_varstring_temp) - 1;
+ for (i = first;i < pr_argc && out < outend;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;
- }
+ while (out < outend && *s)
+ *out++ = *s++;
}
- pr_varstring_temp[end] = 0;
+ *out++ = 0;
return pr_varstring_temp;
}
"DP_ENT_VIEWMODEL "
"DP_GFX_FOG "
"DP_GFX_SKYBOX "
+"DP_GFX_EXTERNALTEXTURES "
"DP_HALFLIFE_MAP "
+"DP_HALFLIFE_MAP_CVAR "
"DP_INPUTBUTTONS "
"DP_MONSTERWALK "
"DP_MOVETYPEBOUNCEMISSILE "
nomonsters = G_FLOAT(OFS_PARM2);
ent = G_EDICT(OFS_PARM3);
- trace = SV_Move (v1, vec3_origin, vec3_origin, v2, nomonsters ? MOVE_NOMONSTERS : MOVE_NORMAL, ent);
+ trace = SV_Move (v1, vec3_origin, vec3_origin, v2, nomonsters, ent);
pr_global_struct->trace_allsolid = trace.allsolid;
pr_global_struct->trace_startsolid = trace.startsolid;
int PF_newcheckclient (int check)
{
int i;
- qbyte *pvs;
edict_t *ent;
- mleaf_t *leaf;
vec3_t org;
// cycle to the next one
// 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 );
+ memcpy (checkpvs, sv.worldmodel->brushq1.LeafPVS(sv.worldmodel, sv.worldmodel->brushq1.PointInLeaf(sv.worldmodel, org)), (sv.worldmodel->brushq1.numleafs+7)>>3 );
return i;
}
// 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);
+ leaf = sv.worldmodel->brushq1.PointInLeaf(sv.worldmodel, view);
if (leaf)
{
- l = (leaf - sv.worldmodel->leafs) - 1;
+ l = (leaf - sv.worldmodel->brushq1.leafs) - 1;
if ( (l<0) || !(checkpvs[l>>3] & (1<<(l&7)) ) )
{
c_notvis++;
Host_Error ("PF_Precache_*: Precache can only be done in spawn functions");
s = G_STRING(OFS_PARM0);
- if (sv.worldmodel->ishlbsp && ((!s) || (!s[0])))
+ if (sv.worldmodel->brushq1.ishlbsp && ((!s) || (!s[0])))
return;
G_INT(OFS_RETURN) = G_INT(OFS_PARM0);
PR_CheckEmptyString (s);
*/
void PF_pointcontents (void)
{
- G_FLOAT(OFS_RETURN) = Mod_PointContents(G_VECTOR(OFS_PARM0), sv.worldmodel);
+ G_FLOAT(OFS_RETURN) = SV_PointContents(G_VECTOR(OFS_PARM0));
}
/*
*/
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);
}
client = &svs.clients[entnum-1];
+ if ((val = GETEDICTFIELDVALUE(client->edict, eval_clientcolors)))
+ val->_float = i;
client->colors = i;
+ client->old_colors = i;
client->edict->v->team = (i & 15) + 1;
MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors);
model = sv.models[modelindex];
if (model->type != mod_brush)
return NULL;
- if (surfnum < 0 || surfnum >= model->nummodelsurfaces)
+ if (surfnum < 0 || surfnum >= model->brushq1.nummodelsurfaces)
return NULL;
- return model->surfaces + surfnum + model->firstmodelsurface;
+ return model->brushq1.surfaces + surfnum + model->brushq1.firstmodelsurface;
}
VectorSubtract(point, ed->v->origin, p);
best = -1;
bestdist = 1000000000;
- for (surfnum = 0;surfnum < model->nummodelsurfaces;surfnum++)
+ for (surfnum = 0;surfnum < model->brushq1.nummodelsurfaces;surfnum++)
{
- surf = model->surfaces + surfnum + model->firstmodelsurface;
+ surf = model->brushq1.surfaces + surfnum + model->brushq1.firstmodelsurface;
dist = PlaneDiff(p, surf->plane);
dist = dist * dist;
if (dist < bestdist)