From 7cd2c9493983d745cfc5e27620402edf63cb0eb0 Mon Sep 17 00:00:00 2001 From: havoc Date: Tue, 8 Mar 2005 13:05:11 +0000 Subject: [PATCH] changed brushq3 submodel firstsurface and firstbrush from pointers to integers git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5057 d7cf8633-e32d-0410-b094-e92efae38249 --- model_brush.c | 8 ++++---- model_brush.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/model_brush.c b/model_brush.c index 5969bf8b..ae4d0b8a 100644 --- a/model_brush.c +++ b/model_brush.c @@ -4436,13 +4436,13 @@ static void Mod_Q3BSP_LoadModels(lump_t *l) c = LittleLong(in->numfaces); if (n < 0 || n + c > loadmodel->brush.num_surfaces) Host_Error("Mod_Q3BSP_LoadModels: invalid face range %i : %i (%i faces)\n", n, n + c, loadmodel->brush.num_surfaces); - out->firstsurface = loadmodel->brush.data_surfaces + n; + out->firstsurface = n; out->numsurfaces = c; n = LittleLong(in->firstbrush); c = LittleLong(in->numbrushes); if (n < 0 || n + c > loadmodel->brush.num_brushes) Host_Error("Mod_Q3BSP_LoadModels: invalid brush range %i : %i (%i brushes)\n", n, n + c, loadmodel->brush.num_brushes); - out->firstbrush = loadmodel->brush.data_brushes + n; + out->firstbrush = n; out->numbrushes = c; } } @@ -5593,9 +5593,9 @@ void Mod_Q3BSP_Load(model_t *mod, void *buffer) mod->brush.submodel = i; // make the model surface list (used by shadowing/lighting) - mod->firstmodelsurface = mod->brushq3.data_models[i].firstsurface - mod->brush.data_surfaces; + mod->firstmodelsurface = mod->brushq3.data_models[i].firstsurface; mod->nummodelsurfaces = mod->brushq3.data_models[i].numsurfaces; - mod->firstmodelbrush = mod->brushq3.data_models[i].firstbrush - mod->brush.data_brushes; + mod->firstmodelbrush = mod->brushq3.data_models[i].firstbrush; mod->nummodelbrushes = mod->brushq3.data_models[i].numbrushes; mod->surfacelist = Mem_Alloc(loadmodel->mempool, mod->nummodelsurfaces * sizeof(*mod->surfacelist)); for (j = 0;j < mod->nummodelsurfaces;j++) diff --git a/model_brush.h b/model_brush.h index 9412d774..68ff89a7 100644 --- a/model_brush.h +++ b/model_brush.h @@ -766,9 +766,9 @@ typedef struct q3mmodel_s vec3_t mins; vec3_t maxs; int numsurfaces; - struct msurface_s *firstsurface; + int firstsurface; int numbrushes; - struct q3mbrush_s *firstbrush; + int firstbrush; } q3mmodel_t; -- 2.39.2