team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

yet more fixes... 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4075 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2012-07-15 03:18:34 +00:00
parent a0acf7ceab
commit b0d236c5c0
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/common/gl_q2bsp.c
View File

@ -4543,8 +4543,10 @@ int CM_PointContents (model_t *mod, vec3_t p)
contents |= brush->contents;
}
}
#ifdef TERRAIN
if (mod->terrain)
contents |= Heightmap_PointContents(mod, NULL, p);
#endif
return contents;
}
@ -5392,6 +5394,7 @@ trace_t CM_BoxTrace (model_t *mod, vec3_t start, vec3_t end,
qboolean CM_NativeTrace(model_t *model, int forcehullnum, int frame, vec3_t axis[3], vec3_t start, vec3_t end, vec3_t mins, vec3_t maxs, unsigned int contents, trace_t *trace)
{
*trace = CM_BoxTrace(model, start, end, mins, maxs, contents);
#ifdef TERRAIN
if (model->terrain)
{
trace_t hmt;
@ -5399,6 +5402,7 @@ qboolean CM_NativeTrace(model_t *model, int forcehullnum, int frame, vec3_t axis
if (hmt.fraction < trace->fraction)
*trace = hmt;
}
#endif
return trace->fraction != 1;
}

6
engine/common/pr_bgcmd.c
View File

@ -374,12 +374,6 @@ void QCBUILTIN PF_getsurfaceclippedpoint(progfuncs_t *prinst, struct globalvars_
void QCBUILTIN PF_terrain_edit(progfuncs_t *prinst, struct globalvars_s *pr_globals)
{
G_FLOAT(OFS_RETURN) = false;
world_t *w = prinst->parms->user;
int action = G_FLOAT(OFS_PARM0);
float *pos = G_VECTOR(OFS_PARM1);
float radius = G_FLOAT(OFS_PARM2);
float quant = G_FLOAT(OFS_PARM3);
G_FLOAT(OFS_RETURN) = Heightmap_Edit(w->worldmodel, action, pos, radius, quant);
}
#endif

2
engine/common/q1bsp.c
View File

@ -1000,6 +1000,7 @@ qboolean Q1BSP_Trace(model_t *model, int forcehullnum, int frame, vec3_t axis[3]
}
}
#ifdef TERRAIN
if (model->terrain && trace->fraction)
{
trace_t hmt;
@ -1007,6 +1008,7 @@ qboolean Q1BSP_Trace(model_t *model, int forcehullnum, int frame, vec3_t axis[3]
if (hmt.fraction < trace->fraction)
*trace = hmt;
}
#endif
return trace->fraction != 1;
}