X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=pr_cmds.c;h=0ef9ba718433801c4fe1e5884db218922fb91834;hb=30cf91679a3f0d8de407a01ea6c669c9ae134e70;hp=ddf9d4587320d477a719e1f3d38997e90f02637b;hpb=ed88ce2b8cbe4beefc930eca3f773997d649e23c;p=xonotic%2Fdarkplaces.git diff --git a/pr_cmds.c b/pr_cmds.c index ddf9d458..0ef9ba71 100644 --- 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 @@ -70,9 +68,12 @@ void PF_VarString(int first, char *out, int outlength) } char *ENGINE_EXTENSIONS = +"DP_BUTTONCHAT " +"DP_BUTTONUSE " "DP_CL_LOADSKY " "DP_CON_SET " "DP_CON_SETA " +"DP_CON_STARTMAP " "DP_EF_ADDITIVE " "DP_EF_BLUE " "DP_EF_FLAME " @@ -96,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 " @@ -125,6 +127,7 @@ char *ENGINE_EXTENSIONS = "DP_QC_TRACE_MOVETYPE_WORLDONLY " "DP_QC_VECTORVECTORS " "DP_QUAKE2_MODEL " +"DP_QUAKE2_SPRITE " "DP_QUAKE3_MODEL " "DP_REGISTERCVAR " "DP_SND_DIRECTIONLESSATTNNONE " @@ -165,8 +168,11 @@ char *ENGINE_EXTENSIONS = "NEH_CMD_PLAY2 " "NEH_RESTOREGAME " "NXQ_GFX_LETTERBOX " +"PRYDON_CLIENTCURSOR " "TENEBRAE_GFX_DLIGHTS " "TW_SV_STEPCONTROL " +"NEXUIZ_PLAYERMODEL " +"NEXUIZ_PLAYERSKIN " ; qboolean checkextension(char *name) @@ -351,10 +357,10 @@ PF_setmodel setmodel(entity, model) ================= */ +static vec3_t quakemins = {-16, -16, -16}, quakemaxs = {16, 16, 16}; void PF_setmodel (void) { edict_t *e; - char *m, **check; model_t *mod; int i; @@ -363,24 +369,19 @@ void PF_setmodel (void) PF_WARNING("setmodel: can not modify world entity\n"); if (e->e->free) PF_WARNING("setmodel: can not modify free entity\n"); - m = G_STRING(OFS_PARM1); - -// check to see if model was properly precached - for (i=0, check = sv.model_precache ; *check ; i++, check++) - if (!strcmp(*check, m)) - break; - - if (!*check) - PF_WARNING(va("setmodel: no precache for model \"%s\"\n", m)); - - - e->v->model = PR_SetString(*check); + i = SV_ModelIndex(G_STRING(OFS_PARM1), 1); + e->v->model = PR_SetString(sv.model_precache[i]); e->v->modelindex = i; - mod = sv.models[ (int)e->v->modelindex]; + mod = sv.models[i]; if (mod) - SetMinMaxSize (e, mod->normalmins, mod->normalmaxs, true); + { + if (mod->type != mod_alias || sv_gameplayfix_setmodelrealbox.integer) + SetMinMaxSize (e, mod->normalmins, mod->normalmaxs, true); + else + SetMinMaxSize (e, quakemins, quakemaxs, true); + } else SetMinMaxSize (e, vec3_origin, vec3_origin, true); } @@ -626,7 +627,6 @@ PF_ambientsound */ void PF_ambientsound (void) { - char **check; char *samp; float *pos; float vol, attenuation; @@ -638,15 +638,9 @@ void PF_ambientsound (void) attenuation = G_FLOAT(OFS_PARM3); // check to see if samp was properly precached - for (soundnum=0, check = sv.sound_precache ; *check ; check++, soundnum++) - if (!strcmp(*check,samp)) - break; - - if (!*check) - { - Con_Printf("no precache: %s\n", samp); + soundnum = SV_SoundIndex(samp, 1); + if (!soundnum) return; - } large = false; if (soundnum >= 256) @@ -1356,59 +1350,17 @@ void PF_precache_file (void) G_INT(OFS_RETURN) = G_INT(OFS_PARM0); } + void PF_precache_sound (void) { - char *s; - int i; - int limit = (sv.protocol == PROTOCOL_QUAKE ? 256 : MAX_SOUNDS); - - if (sv.state != ss_loading) - PF_ERROR("PF_Precache_*: Precache can only be done in spawn functions"); - - s = G_STRING(OFS_PARM0); + SV_SoundIndex(G_STRING(OFS_PARM0), 2); G_INT(OFS_RETURN) = G_INT(OFS_PARM0); - PR_CheckEmptyString (s); - - for (i=0 ; ibrush.ishlbsp && ((!s) || (!s[0]))) - return; + SV_ModelIndex(G_STRING(OFS_PARM0), 2); G_INT(OFS_RETURN) = G_INT(OFS_PARM0); - PR_CheckEmptyString (s); - - for (i = 0;i < limit;i++) - { - if (!sv.model_precache[i]) - { - sv.model_precache[i] = s; - sv.models[i] = Mod_ForName (s, true, false, false); - return; - } - if (!strcmp(sv.model_precache[i], s)) - return; - } - PF_ERROR("PF_precache_model: overflow"); } @@ -1449,7 +1401,7 @@ void PF_walkmove (void) // assume failure if it returns early G_FLOAT(OFS_RETURN) = 0; - + ent = PROG_TO_EDICT(pr_global_struct->self); if (ent == sv.edicts) PF_WARNING("walkmove: can not modify world entity\n"); @@ -2250,8 +2202,8 @@ void PF_effect (void) if (!s || !s[0]) PF_WARNING("effect: no model specified\n"); - i = SV_ModelIndex(s); - if (i < 0) + i = SV_ModelIndex(s, 1); + if (!i) PF_WARNING("effect: model not precached\n"); SV_StartEffect(G_VECTOR(OFS_PARM0), i, G_FLOAT(OFS_PARM2), G_FLOAT(OFS_PARM3), G_FLOAT(OFS_PARM4)); } @@ -2648,32 +2600,43 @@ void PF_te_plasmaburn (void) 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; @@ -2683,74 +2646,79 @@ static msurface_t *getsurface(edict_t *ed, int surfnum) 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->brush.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_SetString(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); @@ -2762,26 +2730,31 @@ void PF_getsurfacenearpoint(void) if (modelindex < 1 || modelindex >= MAX_MODELS) return; model = sv.models[modelindex]; - if (!model->brushq1.numsurfaces) + if (!model->brush.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->brush.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; } } @@ -2792,17 +2765,17 @@ void PF_getsurfacenearpoint(void) 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)); } @@ -2838,7 +2811,7 @@ void PF_stof(void) //float(string filename, float mode) fopen = #110; // opens a file inside quake/gamedir/data/ (mode is FILE_READ, FILE_APPEND, or FILE_WRITE), returns fhandle >= 0 if successful, or fhandle < 0 if unable to open file for any reason void PF_fopen(void) { - int filenum, mode, i; + int filenum, mode; char *modestring, *filename; for (filenum = 0;filenum < MAX_PRFILES;filenum++) if (pr_files[filenum] == NULL) @@ -2867,25 +2840,11 @@ void PF_fopen(void) return; } filename = G_STRING(OFS_PARM0); - // control characters do not cause issues with any platforms I know of, but they are usually annoying to deal with - // ../ is parent directory on many platforms - // // is parent directory on Amiga - // / at the beginning of a path is root on unix, and parent directory on Amiga - // : is root of drive on Amiga (also used as a directory separator on Mac, but / works there too, so that's a bad idea) - // \ is a windows-ism (so it's naughty to use it, / works on all platforms) - for (i = 0;filename[i];i++) - { - if (filename[i] < ' ' || (filename[i] == '/' && filename[i+1] == '/') || (filename[i] == '.' && filename[i+1] == '.') || filename[i] == ':' || filename[i] == '\\' || filename[0] == '/') - { - Con_Printf("PF_fopen: dangerous/confusing/annoying/non-portable filename \"%s\" not allowed. (contains control characters or // or .. or : or \\ or begins with /)\n", filename); - G_FLOAT(OFS_RETURN) = -4; - return; - } - } - pr_files[filenum] = FS_Open(va("data/%s", filename), modestring, false); + // -4 failure (dangerous/non-portable filename) removed, FS_Open checks + 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; @@ -2939,7 +2898,11 @@ void PF_fgets(void) string[end] = 0; // remove \n following \r if (c == '\r') + { c = FS_Getc(pr_files[filenum]); + if (c != '\n') + FS_UnGetc(pr_files[filenum], (unsigned char)c); + } if (developer.integer) Con_Printf("fgets: %s\n", string); if (c >= 0 || end) @@ -3020,7 +2983,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); } @@ -3028,7 +2991,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 @@ -3097,7 +3060,7 @@ void PF_setattachment (void) edict_t *tagentity = G_EDICT(OFS_PARM1); char *tagname = G_STRING(OFS_PARM2); eval_t *v; - int i, modelindex; + int modelindex; model_t *model; if (e == sv.edicts) @@ -3120,15 +3083,7 @@ void PF_setattachment (void) 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); } @@ -3142,35 +3097,15 @@ void PF_setattachment (void) int SV_GetTagIndex (edict_t *e, char *tagname) { - int tagindex, i; + int i; model_t *model; - model = sv.models[(int)e->v->modelindex]; + i = e->v->modelindex; + if (i < 1 || i >= MAX_MODELS) + 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: @@ -3186,7 +3121,7 @@ extern cvar_t cl_bobup; 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; @@ -3203,42 +3138,31 @@ int SV_GetTagMatrix (matrix4x4_t *out, edict_t *ent, int tagindex) 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); - if ((val = GETEDICTFIELDVALUE(ent, eval_tag_entity)) && val->edict) + if ((val = GETEDICTFIELDVALUE(ent, eval_tag_entity)) && val->edict) { // DP_GFX_QUAKE3MODELTAGS, scan all chain and stop on unattached entity attachloop = 0; do { attachent = EDICT_NUM(val->edict); // to this it entity our entity is attached val = GETEDICTFIELDVALUE(ent, eval_tag_index); - if (val->_float) - {// 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); @@ -3250,21 +3174,21 @@ int SV_GetTagMatrix (matrix4x4_t *out, edict_t *ent, int tagindex) Matrix4x4_Concat(out, &entitymatrix, &tagmatrix); out->m[0][3] = entitymatrix.m[0][3] + val->_float*(entitymatrix.m[0][0]*tagmatrix.m[0][3] + entitymatrix.m[0][1]*tagmatrix.m[1][3] + entitymatrix.m[0][2]*tagmatrix.m[2][3]); out->m[1][3] = entitymatrix.m[1][3] + val->_float*(entitymatrix.m[1][0]*tagmatrix.m[0][3] + entitymatrix.m[1][1]*tagmatrix.m[1][3] + entitymatrix.m[1][2]*tagmatrix.m[2][3]); - out->m[2][3] = entitymatrix.m[2][3] + val->_float*(entitymatrix.m[2][0]*tagmatrix.m[0][3] + entitymatrix.m[2][1]*tagmatrix.m[1][3] + entitymatrix.m[2][2]*tagmatrix.m[2][3]); + out->m[2][3] = entitymatrix.m[2][3] + val->_float*(entitymatrix.m[2][0]*tagmatrix.m[0][3] + entitymatrix.m[2][1]*tagmatrix.m[1][3] + entitymatrix.m[2][2]*tagmatrix.m[2][3]); Matrix4x4_Copy(&tagmatrix, out); // finally transformate by matrix of tag on parent entity Matrix4x4_Concat(out, &attachmatrix, &tagmatrix); out->m[0][3] = attachmatrix.m[0][3] + attachmatrix.m[0][0]*tagmatrix.m[0][3] + attachmatrix.m[0][1]*tagmatrix.m[1][3] + attachmatrix.m[0][2]*tagmatrix.m[2][3]; out->m[1][3] = attachmatrix.m[1][3] + attachmatrix.m[1][0]*tagmatrix.m[0][3] + attachmatrix.m[1][1]*tagmatrix.m[1][3] + attachmatrix.m[1][2]*tagmatrix.m[2][3]; - out->m[2][3] = attachmatrix.m[2][3] + attachmatrix.m[2][0]*tagmatrix.m[0][3] + attachmatrix.m[2][1]*tagmatrix.m[1][3] + attachmatrix.m[2][2]*tagmatrix.m[2][3]; + out->m[2][3] = attachmatrix.m[2][3] + attachmatrix.m[2][0]*tagmatrix.m[0][3] + attachmatrix.m[2][1]*tagmatrix.m[1][3] + attachmatrix.m[2][2]*tagmatrix.m[2][3]; Matrix4x4_Copy(&tagmatrix, out); ent = attachent; attachloop += 1; if (attachloop > 255) // prevent runaway looping return 5; - } + } while ((val = GETEDICTFIELDVALUE(ent, eval_tag_entity)) && val->edict); } @@ -3277,7 +3201,7 @@ int SV_GetTagMatrix (matrix4x4_t *out, edict_t *ent, int tagindex) Matrix4x4_Concat(out, &entitymatrix, &tagmatrix); out->m[0][3] = entitymatrix.m[0][3] + val->_float*(entitymatrix.m[0][0]*tagmatrix.m[0][3] + entitymatrix.m[0][1]*tagmatrix.m[1][3] + entitymatrix.m[0][2]*tagmatrix.m[2][3]); out->m[1][3] = entitymatrix.m[1][3] + val->_float*(entitymatrix.m[1][0]*tagmatrix.m[0][3] + entitymatrix.m[1][1]*tagmatrix.m[1][3] + entitymatrix.m[1][2]*tagmatrix.m[2][3]); - out->m[2][3] = entitymatrix.m[2][3] + val->_float*(entitymatrix.m[2][0]*tagmatrix.m[0][3] + entitymatrix.m[2][1]*tagmatrix.m[1][3] + entitymatrix.m[2][2]*tagmatrix.m[2][3]); + out->m[2][3] = entitymatrix.m[2][3] + val->_float*(entitymatrix.m[2][0]*tagmatrix.m[0][3] + entitymatrix.m[2][1]*tagmatrix.m[1][3] + entitymatrix.m[2][2]*tagmatrix.m[2][3]); if ((val = GETEDICTFIELDVALUE(ent, eval_viewmodelforclient)) && val->edict) {// RENDER_VIEWMODEL magic @@ -3292,7 +3216,7 @@ int SV_GetTagMatrix (matrix4x4_t *out, edict_t *ent, int tagindex) Matrix4x4_Concat(out, &entitymatrix, &tagmatrix); out->m[0][3] = entitymatrix.m[0][3] + val->_float*(entitymatrix.m[0][0]*tagmatrix.m[0][3] + entitymatrix.m[0][1]*tagmatrix.m[1][3] + entitymatrix.m[0][2]*tagmatrix.m[2][3]); out->m[1][3] = entitymatrix.m[1][3] + val->_float*(entitymatrix.m[1][0]*tagmatrix.m[0][3] + entitymatrix.m[1][1]*tagmatrix.m[1][3] + entitymatrix.m[1][2]*tagmatrix.m[2][3]); - out->m[2][3] = entitymatrix.m[2][3] + val->_float*(entitymatrix.m[2][0]*tagmatrix.m[0][3] + entitymatrix.m[2][1]*tagmatrix.m[1][3] + entitymatrix.m[2][2]*tagmatrix.m[2][3]); + out->m[2][3] = entitymatrix.m[2][3] + val->_float*(entitymatrix.m[2][0]*tagmatrix.m[0][3] + entitymatrix.m[2][1]*tagmatrix.m[1][3] + entitymatrix.m[2][2]*tagmatrix.m[2][3]); /* // Cl_bob, ported from rendering code @@ -3420,7 +3344,7 @@ void PF_search_begin(void) caseinsens = G_FLOAT(OFS_PARM1); quiet = G_FLOAT(OFS_PARM2); - + for(handle = 0; handle < MAX_SEARCHES; handle++) if(!pr_fssearchlist[handle]) break; @@ -3450,7 +3374,7 @@ void PF_search_end(void) int handle; handle = G_FLOAT(OFS_PARM0); - + if(handle < 0 || handle >= MAX_SEARCHES) { Con_Printf("PF_search_end: invalid handle %i\n", handle); @@ -3489,7 +3413,7 @@ void PF_search_getsize(void) Con_Printf("PF_search_getsize: no such handle %i\n", handle); return; } - + G_FLOAT(OFS_RETURN) = pr_fssearchlist[handle]->numfilenames; } @@ -3523,7 +3447,7 @@ void PF_search_getfilename(void) Con_Printf("PF_search_getfilename: invalid filenum %i\n", filenum); return; } - + tmp = PR_GetTempString(); strcpy(tmp, pr_fssearchlist[handle]->filenames[filenum]); @@ -3793,14 +3717,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) +{ +} + void PR_Cmd_Reset(void) { - Mem_EmptyPool(pr_strings_mempool); PR_Search_Reset(); PR_Files_CloseAll(); }