From b0d236c5c06c1347f069a7b9d13b9efcf9f470d5 Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Sun, 15 Jul 2012 03:18:34 +0000
Subject: [PATCH] yet more fixes...

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4075 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/common/gl_q2bsp.c | 4 ++++
 engine/common/pr_bgcmd.c | 6 ------
 engine/common/q1bsp.c    | 2 ++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/engine/common/gl_q2bsp.c b/engine/common/gl_q2bsp.c
index 84e261e5..888fa389 100644
--- a/engine/common/gl_q2bsp.c
+++ b/engine/common/gl_q2bsp.c
@@ -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;
 }
 
diff --git a/engine/common/pr_bgcmd.c b/engine/common/pr_bgcmd.c
index afee8ca3..30bafcbf 100644
--- a/engine/common/pr_bgcmd.c
+++ b/engine/common/pr_bgcmd.c
@@ -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
 
diff --git a/engine/common/q1bsp.c b/engine/common/q1bsp.c
index 274825e7..dc12371e 100644
--- a/engine/common/q1bsp.c
+++ b/engine/common/q1bsp.c
@@ -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;
 }