From 8463ccc86175e92fa12e1d1533ad7d2dcddda028 Mon Sep 17 00:00:00 2001 From: Spoike Date: Sun, 15 Jul 2012 04:52:57 +0000 Subject: [PATCH] compile fixes. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4077 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/gl/shader.h | 2 +- engine/server/svmodel.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/engine/gl/shader.h b/engine/gl/shader.h index d85af50cb..a1ac07f19 100644 --- a/engine/gl/shader.h +++ b/engine/gl/shader.h @@ -515,7 +515,7 @@ batch_t *D3DBE_GetTempBatch(void); void D3DBE_GenBrushModelVBO(model_t *mod); void D3DBE_ClearVBO(vbo_t *vbo); void D3DBE_UploadAllLightmaps(void); -void D3DBE_DrawWorld (qboolean drawworld, qbyte *vis) +void D3DBE_DrawWorld (qboolean drawworld, qbyte *vis); qboolean D3DBE_LightCullModel(vec3_t org, model_t *model); void D3DBE_SelectEntity(entity_t *ent); void D3DBE_SelectDLight(dlight_t *dl, vec3_t colour); diff --git a/engine/server/svmodel.c b/engine/server/svmodel.c index 36b1bca2e..eaf1297d4 100644 --- a/engine/server/svmodel.c +++ b/engine/server/svmodel.c @@ -1736,6 +1736,9 @@ qboolean Mod_LoadBrushModel (model_t *mod, void *buffer) int start; qboolean noerrors; qboolean longm = false; +#ifdef TERRAIN + model_t *lm = loadmodel; +#endif start = Hunk_LowMark(); @@ -1871,6 +1874,10 @@ qboolean Mod_LoadBrushModel (model_t *mod, void *buffer) } } +#ifdef TERRAIN + lm->terrain = Mod_LoadTerrainInfo(lm, loadname); +#endif + return true; }