From b8f115ebdfbd188caf85378e66e16ea15ac638aa Mon Sep 17 00:00:00 2001 From: havoc Date: Tue, 8 Mar 2005 13:10:30 +0000 Subject: [PATCH] changed uses of q3mmodel_t to q3dmodel_t because there are no actual differences anymore git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5058 d7cf8633-e32d-0410-b094-e92efae38249 --- model_brush.c | 10 +++++----- model_brush.h | 11 ----------- model_shared.h | 2 +- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/model_brush.c b/model_brush.c index ae4d0b8a..f85ba917 100644 --- a/model_brush.c +++ b/model_brush.c @@ -4413,7 +4413,7 @@ static void Mod_Q3BSP_LoadFaces(lump_t *l) static void Mod_Q3BSP_LoadModels(lump_t *l) { q3dmodel_t *in; - q3mmodel_t *out; + q3dmodel_t *out; int i, j, n, c, count; in = (void *)(mod_base + l->fileofs); @@ -4436,8 +4436,8 @@ 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 = n; - out->numsurfaces = c; + out->firstface = n; + out->numfaces = c; n = LittleLong(in->firstbrush); c = LittleLong(in->numbrushes); if (n < 0 || n + c > loadmodel->brush.num_brushes) @@ -5593,8 +5593,8 @@ 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->nummodelsurfaces = mod->brushq3.data_models[i].numsurfaces; + mod->firstmodelsurface = mod->brushq3.data_models[i].firstface; + mod->nummodelsurfaces = mod->brushq3.data_models[i].numfaces; 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)); diff --git a/model_brush.h b/model_brush.h index 68ff89a7..fe3adef4 100644 --- a/model_brush.h +++ b/model_brush.h @@ -761,17 +761,6 @@ q3dpvs_t; #define Q3TEXTUREFLAG_AUTOSPRITE2 32 #define Q3TEXTUREFLAG_ALPHATEST 64 -typedef struct q3mmodel_s -{ - vec3_t mins; - vec3_t maxs; - int numsurfaces; - int firstsurface; - int numbrushes; - int firstbrush; -} -q3mmodel_t; - typedef struct q3mbrush_s { struct colbrushf_s *colbrushf; diff --git a/model_shared.h b/model_shared.h index c54472a4..e2071a51 100644 --- a/model_shared.h +++ b/model_shared.h @@ -306,7 +306,7 @@ model_brushq2_t; typedef struct model_brushq3_s { int num_models; - q3mmodel_t *data_models; + q3dmodel_t *data_models; // freed after loading! int num_vertices; -- 2.39.2