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
"DP_GFX_SKYBOX "
"DP_HALFLIFE_MAP "
"DP_HALFLIFE_MAP_CVAR "
+"DP_HALFLIFE_SPRITE "
"DP_INPUTBUTTONS "
"DP_LITSPRITES "
"DP_LITSUPPORT "
"DP_QC_TRACE_MOVETYPE_WORLDONLY "
"DP_QC_VECTORVECTORS "
"DP_QUAKE2_MODEL "
+"DP_QUAKE2_SPRITE "
"DP_QUAKE3_MODEL "
"DP_REGISTERCVAR "
"DP_SND_DIRECTIONLESSATTNNONE "
"NEXUIZ_PLAYERSKIN "
;
-qboolean checkextension(char *name)
+qboolean checkextension(const char *name)
{
int len;
char *e, *start;
if (e->e->free)
PF_WARNING("setmodel: can not modify free entity\n");
i = SV_ModelIndex(G_STRING(OFS_PARM1), 1);
- e->v->model = PR_SetString(sv.model_precache[i]);
+ e->v->model = PR_SetEngineString(sv.model_precache[i]);
e->v->modelindex = i;
mod = sv.models[i];
*/
void PF_ambientsound (void)
{
- char *samp;
+ const char *samp;
float *pos;
float vol, attenuation;
int soundnum, large;
*/
void PF_sound (void)
{
- char *sample;
+ const char *sample;
int channel;
edict_t *entity;
int volume;
void PF_stuffcmd (void)
{
int entnum;
- char *str;
+ const char *str;
client_t *old;
entnum = G_EDICTNUM(OFS_PARM0);
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)
{
{
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);
sprintf(s, "%i", (int)v);
else
sprintf(s, "%f", v);
- G_INT(OFS_RETURN) = PR_SetString(s);
+ G_INT(OFS_RETURN) = PR_SetEngineString(s);
}
void PF_fabs (void)
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) = PR_SetString(s);
+ G_INT(OFS_RETURN) = PR_SetEngineString(s);
}
void PF_etos (void)
char *s;
s = PR_GetTempString();
sprintf (s, "entity %i", G_EDICTNUM(OFS_PARM0));
- G_INT(OFS_RETURN) = PR_SetString(s);
+ G_INT(OFS_RETURN) = PR_SetEngineString(s);
}
void PF_Spawn (void)
{
int e;
int f;
- char *s, *t;
+ const char *s, *t;
edict_t *ed;
e = G_EDICTNUM(OFS_PARM0);
{
int i;
int f;
- char *s, *t;
+ const char *s, *t;
edict_t *ent, *chain;
chain = (edict_t *)sv.edicts;
RETURN_EDICT(chain);
}
-void PR_CheckEmptyString (char *s)
-{
- if (s[0] <= ' ')
- PF_ERROR("Bad string");
-}
-
void PF_precache_file (void)
{ // precache_file is only used to copy files with qcc, it does nothing
G_INT(OFS_RETURN) = G_INT(OFS_PARM0);
void PF_lightstyle (void)
{
int style;
- char *val;
+ const char *val;
client_t *client;
int j;
val = G_STRING(OFS_PARM1);
// change the string in sv
- sv.lightstyles[style] = val;
+ strlcpy(sv.lightstyles[style], val, sizeof(sv.lightstyles[style]));
// send message to all clients on this server
if (sv.state != ss_active)
*/
void PF_changelevel (void)
{
- char *s;
+ const char *s;
// make sure we don't issue two changelevels
if (svs.changelevel_issued)
void PF_registercvar (void)
{
- char *name, *value;
+ const char *name, *value;
name = G_STRING(OFS_PARM0);
value = G_STRING(OFS_PARM1);
G_FLOAT(OFS_RETURN) = 0;
void PF_effect (void)
{
int i;
- char *s;
+ const char *s;
s = G_STRING(OFS_PARM1);
if (!s || !s[0])
PF_WARNING("effect: no model specified\n");
// 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));
MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
}
-static void clippointtosurface(msurface_t *surf, vec3_t p, vec3_t out)
+static void clippointtosurface(msurface_t *surface, vec3_t p, vec3_t out)
{
- int i, j;
- vec3_t v1, clipplanenormal, normal;
- vec_t clipplanedist, clipdist;
+ int i, j, k;
+ float *v[3], facenormal[3], edgenormal[3], sidenormal[3], temp[3], offsetdist, dist, bestdist;
+ const int *e;
+ bestdist = 1000000000;
VectorCopy(p, out);
- if (surf->flags & SURF_PLANEBACK)
- VectorNegate(surf->plane->normal, normal);
- else
- VectorCopy(surf->plane->normal, normal);
- for (i = 0, j = surf->poly_numverts - 1;i < surf->poly_numverts;j = i, i++)
- {
- VectorSubtract(&surf->poly_verts[j * 3], &surf->poly_verts[i * 3], v1);
- VectorNormalizeFast(v1);
- CrossProduct(v1, normal, clipplanenormal);
- clipplanedist = DotProduct(&surf->poly_verts[i * 3], clipplanenormal);
- clipdist = DotProduct(out, clipplanenormal) - clipplanedist;
- if (clipdist > 0)
+ for (i = 0, e = (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle);i < surface->num_triangles;i++, e += 3)
+ {
+ // clip original point to each triangle of the surface and find the
+ // triangle that is closest
+ v[0] = surface->groupmesh->data_vertex3f + e[0] * 3;
+ v[1] = surface->groupmesh->data_vertex3f + e[1] * 3;
+ v[2] = surface->groupmesh->data_vertex3f + e[2] * 3;
+ TriangleNormal(v[0], v[1], v[2], facenormal);
+ VectorNormalize(facenormal);
+ offsetdist = DotProduct(v[0], facenormal) - DotProduct(p, facenormal);
+ VectorMA(p, offsetdist, facenormal, temp);
+ for (j = 0, k = 2;j < 3;k = j, j++)
{
- clipdist = -clipdist;
- VectorMA(out, clipdist, clipplanenormal, out);
+ VectorSubtract(v[k], v[j], edgenormal);
+ CrossProduct(edgenormal, facenormal, sidenormal);
+ VectorNormalize(sidenormal);
+ offsetdist = DotProduct(v[k], sidenormal) - DotProduct(temp, sidenormal);
+ if (offsetdist < 0)
+ VectorMA(temp, offsetdist, sidenormal, temp);
+ }
+ dist = VectorDistance2(temp, p);
+ if (bestdist > dist)
+ {
+ bestdist = dist;
+ VectorCopy(temp, out);
}
}
}
-static msurface_t *getsurface(edict_t *ed, int surfnum)
+static msurface_t *getsurface(edict_t *ed, int surfacenum)
{
int modelindex;
model_t *model;
if (modelindex < 1 || modelindex >= MAX_MODELS)
return NULL;
model = sv.models[modelindex];
- if (surfnum < 0 || surfnum >= model->nummodelsurfaces)
+ if (surfacenum < 0 || surfacenum >= model->nummodelsurfaces)
return NULL;
- return model->brushq1.surfaces + surfnum + model->firstmodelsurface;
+ return model->data_surfaces + surfacenum + model->firstmodelsurface;
}
//PF_getsurfacenumpoints, // #434 float(entity e, float s) getsurfacenumpoints = #434;
void PF_getsurfacenumpoints(void)
{
- msurface_t *surf;
+ msurface_t *surface;
// return 0 if no such surface
- if (!(surf = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
+ if (!(surface = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
{
G_FLOAT(OFS_RETURN) = 0;
return;
}
- G_FLOAT(OFS_RETURN) = surf->poly_numverts;
+ // note: this (incorrectly) assumes it is a simple polygon
+ G_FLOAT(OFS_RETURN) = surface->num_vertices;
}
//PF_getsurfacepoint, // #435 vector(entity e, float s, float n) getsurfacepoint = #435;
void PF_getsurfacepoint(void)
{
edict_t *ed;
- msurface_t *surf;
+ msurface_t *surface;
int pointnum;
VectorClear(G_VECTOR(OFS_RETURN));
ed = G_EDICT(OFS_PARM0);
if (!ed || ed->e->free)
return;
- if (!(surf = getsurface(ed, G_FLOAT(OFS_PARM1))))
+ if (!(surface = getsurface(ed, G_FLOAT(OFS_PARM1))))
return;
+ // note: this (incorrectly) assumes it is a simple polygon
pointnum = G_FLOAT(OFS_PARM2);
- if (pointnum < 0 || pointnum >= surf->poly_numverts)
+ if (pointnum < 0 || pointnum >= surface->num_vertices)
return;
// FIXME: implement rotation/scaling
- VectorAdd(&surf->poly_verts[pointnum * 3], ed->v->origin, G_VECTOR(OFS_RETURN));
+ VectorAdd(&(surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex)[pointnum * 3], ed->v->origin, G_VECTOR(OFS_RETURN));
}
//PF_getsurfacenormal, // #436 vector(entity e, float s) getsurfacenormal = #436;
void PF_getsurfacenormal(void)
{
- msurface_t *surf;
+ msurface_t *surface;
+ vec3_t normal;
VectorClear(G_VECTOR(OFS_RETURN));
- if (!(surf = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
+ if (!(surface = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
return;
// FIXME: implement rotation/scaling
- if (surf->flags & SURF_PLANEBACK)
- VectorNegate(surf->plane->normal, G_VECTOR(OFS_RETURN));
- else
- VectorCopy(surf->plane->normal, G_VECTOR(OFS_RETURN));
+ // note: this (incorrectly) assumes it is a simple polygon
+ // note: this only returns the first triangle, so it doesn't work very
+ // well for curved surfaces or arbitrary meshes
+ TriangleNormal((surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex), (surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex) + 3, (surface->groupmesh->data_vertex3f + 3 * surface->num_firstvertex) + 6, normal);
+ VectorNormalize(normal);
+ VectorCopy(normal, G_VECTOR(OFS_RETURN));
}
//PF_getsurfacetexture, // #437 string(entity e, float s) getsurfacetexture = #437;
void PF_getsurfacetexture(void)
{
- msurface_t *surf;
+ msurface_t *surface;
G_INT(OFS_RETURN) = 0;
- if (!(surf = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
+ if (!(surface = getsurface(G_EDICT(OFS_PARM0), G_FLOAT(OFS_PARM1))))
return;
- G_INT(OFS_RETURN) = PR_SetString(surf->texinfo->texture->name);
+ G_INT(OFS_RETURN) = PR_SetEngineString(surface->texture->name);
}
//PF_getsurfacenearpoint, // #438 float(entity e, vector p) getsurfacenearpoint = #438;
void PF_getsurfacenearpoint(void)
{
- int surfnum, best, modelindex;
+ int surfacenum, best, modelindex;
vec3_t clipped, p;
vec_t dist, bestdist;
edict_t *ed;
model_t *model;
- msurface_t *surf;
+ msurface_t *surface;
vec_t *point;
G_FLOAT(OFS_RETURN) = -1;
ed = G_EDICT(OFS_PARM0);
if (modelindex < 1 || modelindex >= MAX_MODELS)
return;
model = sv.models[modelindex];
- if (!model->brushq1.numsurfaces)
+ if (!model->num_surfaces)
return;
// FIXME: implement rotation/scaling
VectorSubtract(point, ed->v->origin, p);
best = -1;
bestdist = 1000000000;
- for (surfnum = 0;surfnum < model->nummodelsurfaces;surfnum++)
- {
- surf = model->brushq1.surfaces + surfnum + model->firstmodelsurface;
- dist = PlaneDiff(p, surf->plane);
- dist = dist * dist;
+ for (surfacenum = 0;surfacenum < model->nummodelsurfaces;surfacenum++)
+ {
+ surface = model->data_surfaces + surfacenum + model->firstmodelsurface;
+ // first see if the nearest point on the surface's box is closer than the previous match
+ clipped[0] = bound(surface->mins[0], p[0], surface->maxs[0]) - p[0];
+ clipped[1] = bound(surface->mins[1], p[1], surface->maxs[1]) - p[1];
+ clipped[2] = bound(surface->mins[2], p[2], surface->maxs[2]) - p[2];
+ dist = VectorLength2(clipped);
if (dist < bestdist)
{
- clippointtosurface(surf, p, clipped);
+ // it is, check the nearest point on the actual geometry
+ clippointtosurface(surface, p, clipped);
VectorSubtract(clipped, p, clipped);
- dist += DotProduct(clipped, clipped);
+ dist += VectorLength2(clipped);
if (dist < bestdist)
{
- best = surfnum;
+ // that's closer too, store it as the best match
+ best = surfacenum;
bestdist = dist;
}
}
void PF_getsurfaceclippedpoint(void)
{
edict_t *ed;
- msurface_t *surf;
+ msurface_t *surface;
vec3_t p, out;
VectorClear(G_VECTOR(OFS_RETURN));
ed = G_EDICT(OFS_PARM0);
if (!ed || ed->e->free)
return;
- if (!(surf = getsurface(ed, G_FLOAT(OFS_PARM1))))
+ if (!(surface = getsurface(ed, G_FLOAT(OFS_PARM1))))
return;
// FIXME: implement rotation/scaling
VectorSubtract(G_VECTOR(OFS_PARM2), ed->v->origin, p);
- clippointtosurface(surf, p, out);
+ clippointtosurface(surface, p, out);
// FIXME: implement rotation/scaling
VectorAdd(out, ed->v->origin, G_VECTOR(OFS_RETURN));
}
void PF_fopen(void)
{
int filenum, mode;
- char *modestring, *filename;
+ const char *modestring, *filename;
for (filenum = 0;filenum < MAX_PRFILES;filenum++)
if (pr_files[filenum] == NULL)
break;
}
filename = G_STRING(OFS_PARM0);
// -4 failure (dangerous/non-portable filename) removed, FS_Open checks
- pr_files[filenum] = FS_Open(va("data/%s", filename), modestring, false);
+ pr_files[filenum] = FS_Open(va("data/%s", filename), modestring, false, false);
if (pr_files[filenum] == NULL && modestring == "rb")
- pr_files[filenum] = FS_Open(filename, modestring, false);
+ pr_files[filenum] = FS_Open(filename, modestring, false, false);
if (pr_files[filenum] == NULL)
G_FLOAT(OFS_RETURN) = -1;
if (developer.integer)
Con_Printf("fgets: %s\n", string);
if (c >= 0 || end)
- G_INT(OFS_RETURN) = PR_SetString(string);
+ G_INT(OFS_RETURN) = PR_SetEngineString(string);
else
G_INT(OFS_RETURN) = 0;
}
//float(string s) strlen = #114; // returns how many characters are in a string
void PF_strlen(void)
{
- char *s;
+ const char *s;
s = G_STRING(OFS_PARM0);
if (s)
G_FLOAT(OFS_RETURN) = strlen(s);
{
char *s = PR_GetTempString();
PF_VarString(0, s, STRINGTEMP_LENGTH);
- G_INT(OFS_RETURN) = PR_SetString(s);
+ G_INT(OFS_RETURN) = PR_SetEngineString(s);
}
//string(string s, float start, float length) substring = #116; // returns a section of a string as a tempstring
void PF_substring(void)
{
int i, start, length;
- char *s, *string = PR_GetTempString();
+ const char *s;
+ char *string = PR_GetTempString();
s = G_STRING(OFS_PARM0);
start = G_FLOAT(OFS_PARM1);
length = G_FLOAT(OFS_PARM2);
for (i = 0;i < STRINGTEMP_LENGTH - 1 && *s && i < length;i++, s++)
string[i] = *s;
string[i] = 0;
- G_INT(OFS_RETURN) = PR_SetString(string);
+ G_INT(OFS_RETURN) = PR_SetEngineString(string);
}
//vector(string s) stov = #117; // returns vector value from a string
//string(string s) strzone = #118; // makes a copy of a string into the string zone and returns it, this is often used to keep around a tempstring for longer periods of time (tempstrings are replaced often)
void PF_strzone(void)
{
- char *in, *out;
+ const char *in;
+ char *out;
in = G_STRING(OFS_PARM0);
- out = Mem_Alloc(pr_strings_mempool, strlen(in) + 1);
+ out = PR_AllocString(strlen(in) + 1);
strcpy(out, in);
- G_INT(OFS_RETURN) = PR_SetString(out);
+ G_INT(OFS_RETURN) = PR_SetQCString(out);
}
//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_FreeString((char *)G_STRING(OFS_PARM0));
}
//void(entity e, string s) clientcommand = #440; // executes a command string as if it came from the specified client
{
int token_num = G_FLOAT(OFS_PARM0);
if (token_num >= 0 && token_num < num_tokens)
- G_INT(OFS_RETURN) = PR_SetString(tokens[token_num]);
+ G_INT(OFS_RETURN) = PR_SetEngineString(tokens[token_num]);
else
- G_INT(OFS_RETURN) = PR_SetString("");
+ G_INT(OFS_RETURN) = PR_SetEngineString(NULL);
}
//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)
{
edict_t *e = G_EDICT(OFS_PARM0);
edict_t *tagentity = G_EDICT(OFS_PARM1);
- char *tagname = G_STRING(OFS_PARM2);
+ const char *tagname = G_STRING(OFS_PARM2);
eval_t *v;
- int i, modelindex;
+ int modelindex;
model_t *model;
if (e == sv.edicts)
modelindex = (int)tagentity->v->modelindex;
if (modelindex >= 0 && modelindex < MAX_MODELS && (model = sv.models[modelindex]))
{
- if (model->data_overridetagnamesforskin && (unsigned int)tagentity->v->skin < (unsigned int)model->numskins && model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].num_overridetagnames)
- for (i = 0;i < model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].num_overridetagnames;i++)
- if (!strcmp(tagname, model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].data_overridetagnames[i].name))
- v->_float = i + 1;
- // FIXME: use a model function to get tag info (need to handle skeletal)
- if (v->_float == 0 && 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;
+ v->_float = Mod_Alias_GetTagIndexForName(model, tagentity->v->skin, tagname);
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);
}
/////////////////////////////////////////
// DP_MD3_TAGINFO extension coded by VorteX
-int SV_GetTagIndex (edict_t *e, char *tagname)
+int SV_GetTagIndex (edict_t *e, const char *tagname)
{
- int tagindex, i;
+ int i;
model_t *model;
i = e->v->modelindex;
return -1;
model = sv.models[i];
- tagindex = -1;
- if (model->data_overridetagnamesforskin && (unsigned int)e->v->skin < (unsigned int)model->numskins && model->data_overridetagnamesforskin[(unsigned int)e->v->skin].num_overridetagnames)
- {
- for (i = 0; i < model->data_overridetagnamesforskin[(unsigned int)e->v->skin].num_overridetagnames; i++)
- {
- if (!strcmp(tagname, model->data_overridetagnamesforskin[(unsigned int)e->v->skin].data_overridetagnames[i].name))
- {
- tagindex = i;
- break;
- }
- }
- }
- if (tagindex == -1)
- {
- for (i = 0;i < model->alias.aliasnum_tags; i++)
- {
- if (!(strcmp(tagname, model->alias.aliasdata_tags[i].name)))
- {
- tagindex = i;
- break;
- }
- }
- }
- return tagindex + 1;
+ return Mod_Alias_GetTagIndexForName(model, e->v->skin, tagname);
};
// Warnings/errors code:
int SV_GetTagMatrix (matrix4x4_t *out, edict_t *ent, int tagindex)
{
eval_t *val;
- int modelindex, reqtag, reqframe, attachloop;
+ int modelindex, reqframe, attachloop;
matrix4x4_t entitymatrix, tagmatrix, attachmatrix;
edict_t *attachent;
model_t *model;
return 3;
model = sv.models[modelindex];
- reqtag = model->alias.aliasnum_tags;
-
- if (tagindex <= 0 || tagindex > reqtag)
- {
- if (reqtag && tagindex) // Only appear if model has no tags or not-null tag requested
- return 4;
- return 0;
- }
- if (ent->v->frame < 0 || ent->v->frame > model->alias.aliasnum_tagframes)
- reqframe = model->numframes - 1; // if model has wrong frame, engine automatically switches to model last frame
+ if (ent->v->frame >= 0 && ent->v->frame < model->numframes && model->animscenes)
+ reqframe = model->animscenes[(int)ent->v->frame].firstframe;
else
- reqframe = ent->v->frame;
+ reqframe = 0; // if model has wrong frame, engine automatically switches to model first frame
// get initial tag matrix
if (tagindex)
{
- reqtag = (tagindex - 1) + ent->v->frame*model->alias.aliasnum_tags;
- Matrix4x4_Copy(&tagmatrix, &model->alias.aliasdata_tags[reqtag].matrix);
+ int ret = Mod_Alias_GetTagMatrix(model, reqframe, tagindex - 1, &tagmatrix);
+ if (ret)
+ return ret;
}
else
Matrix4x4_CreateIdentity(&tagmatrix);
{
attachent = EDICT_NUM(val->edict); // to this it entity our entity is attached
val = GETEDICTFIELDVALUE(ent, eval_tag_index);
- Matrix4x4_CreateIdentity(&attachmatrix);
- if (val->_float >= 1 && attachent->v->modelindex >= 1 && attachent->v->modelindex < MAX_MODELS)
- {
- model = sv.models[(int)attachent->v->modelindex];
- if (val->_float < model->alias.aliasnum_tags)
- {
- // got tagname on parent entity attachment tag via tag_index (and got it's matrix)
- model = sv.models[(int)attachent->v->modelindex];
- reqtag = (val->_float - 1) + attachent->v->frame*model->alias.aliasnum_tags;
- Matrix4x4_Copy(&attachmatrix, &model->alias.aliasdata_tags[reqtag].matrix);
- }
- }
+ if (val->_float >= 1 && attachent->v->modelindex >= 1 && attachent->v->modelindex < MAX_MODELS && (model = sv.models[(int)attachent->v->modelindex]) && model->animscenes && attachent->v->frame >= 0 && attachent->v->frame < model->numframes)
+ Mod_Alias_GetTagMatrix(model, model->animscenes[(int)attachent->v->frame].firstframe, val->_float - 1, &attachmatrix);
+ else
+ Matrix4x4_CreateIdentity(&attachmatrix);
// apply transformation by child entity matrix
val = GETEDICTFIELDVALUE(ent, eval_scale);
void PF_gettagindex (void)
{
edict_t *ent = G_EDICT(OFS_PARM0);
- char *tag_name = G_STRING(OFS_PARM1);
+ const char *tag_name = G_STRING(OFS_PARM1);
int modelindex, tag_index;
if (ent == sv.edicts)
void PF_search_begin(void)
{
int handle;
- char *pattern;
+ const char *pattern;
int caseinsens, quiet;
pattern = G_STRING(OFS_PARM0);
-
- PR_CheckEmptyString(pattern);
+ if (!pattern || pattern[0] <= ' ')
+ PF_ERROR("PF_search_begin: Bad string");
caseinsens = G_FLOAT(OFS_PARM1);
quiet = G_FLOAT(OFS_PARM2);
tmp = PR_GetTempString();
strcpy(tmp, pr_fssearchlist[handle]->filenames[filenum]);
- G_INT(OFS_RETURN) = PR_SetString(tmp);
+ G_INT(OFS_RETURN) = PR_SetEngineString(tmp);
}
void PF_cvar_string (void)
{
- char *str;
+ const char *str;
cvar_t *var;
char *tmp;
strcpy(tmp, var->string);
}
else
- tmp = "";
- G_INT(OFS_RETURN) = PR_SetString(tmp);
+ tmp = NULL;
+ G_INT(OFS_RETURN) = PR_SetEngineString(tmp);
}
//void(entity clent) dropclient (DP_SV_DROPCLIENT)
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();
}
projects / xonotic / darkplaces.git / blobdiff