*/
-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_GLOW "
"DP_ENT_SCALE "
"DP_ENT_VIEWMODEL "
+"DP_GFX_EXTERNALTEXTURES "
"DP_GFX_FOG "
+"DP_GFX_QUAKE3MODELTAGS "
+"DP_GFX_SKINFILES "
"DP_GFX_SKYBOX "
"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));
}
/*
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)
G_INT(OFS_RETURN) = PR_SetString("");
}
+//void(entity e, entity tagentity, string tagname) setattachment = #443; // attachs e to a tag on tagentity (note: use "" to attach to entity origin/angles instead of a tag)
+void PF_setattachment (void)
+{
+ edict_t *e = G_EDICT(OFS_PARM0);
+ edict_t *tagentity = G_EDICT(OFS_PARM1);
+ char *tagname = G_STRING(OFS_PARM2);
+ eval_t *v;
+ int i, modelindex;
+ model_t *model;
+
+ if (tagentity == NULL)
+ tagentity = sv.edicts;
+
+ v = GETEDICTFIELDVALUE(e, eval_tag_entity);
+ if (v)
+ v->edict = EDICT_TO_PROG(tagentity);
+
+ v = GETEDICTFIELDVALUE(e, eval_tag_index);
+ if (v)
+ v->_float = 0;
+ if (tagentity != NULL && tagentity != sv.edicts && tagname && tagname[0])
+ {
+ modelindex = (int)tagentity->v->modelindex;
+ if (modelindex >= 0 && modelindex < MAX_MODELS)
+ {
+ model = sv.models[modelindex];
+ if (model->alias.aliasnum_tags)
+ for (i = 0;i < model->alias.aliasnum_tags;i++)
+ if (!strcmp(tagname, model->alias.aliasdata_tags[i].name))
+ v->_float = i + 1;
+ if (v->_float == 0)
+ Con_DPrintf("setattachment(edict %i, edict %i, string \"%s\"): tried to find tag named \"%s\" on entity %i (model \"%s\") but could not find it\n", NUM_FOR_EDICT(e), NUM_FOR_EDICT(tagentity), tagname, tagname, NUM_FOR_EDICT(tagentity), model->name);
+ }
+ else
+ Con_DPrintf("setattachment(edict %i, edict %i, string \"%s\"): tried to find tag named \"%s\" on entity %i but it has no model\n", NUM_FOR_EDICT(e), NUM_FOR_EDICT(tagentity), tagname, tagname, NUM_FOR_EDICT(tagentity));
+ }
+}
+
builtin_t pr_builtin[] =
{
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
+PF_setattachment, // #443 void(entity e, entity tagentity, string tagname) setattachment (DP_GFX_QUAKE3MODELTAGS)
NULL, // #444
NULL, // #445
NULL, // #446