changed uses of q3mmodel_t to q3dmodel_t because there are no actual differences...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5058 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/model_brush.c b/model_brush.c
index ae4d0b8a9a24a333a32fa16abf6ebf231ec87631..f85ba91714c02595695fba27fd21550d0cd37a1d 100644 (file)
--- 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;
 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);
        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);
                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)
                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->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));
                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 68ff89a752bdecbaab2ff86c64763fd144069c49..fe3adef4ec14a54e88c6f87ea97b1bb8ed047e84 100644 (file)
--- a/model_brush.h
+++ b/model_brush.h
@@ -761,17 +761,6 @@ q3dpvs_t;
 #define Q3TEXTUREFLAG_AUTOSPRITE2 32
 #define Q3TEXTUREFLAG_ALPHATEST 64
 
 #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;
 typedef struct q3mbrush_s
 {
        struct colbrushf_s *colbrushf;

diff --git a/model_shared.h b/model_shared.h
index c54472a429f0c500873d11ae6ea6b3c94f016f08..e2071a5175e0fef732031e49acf7b390e9895c4f 100644 (file)
--- a/model_shared.h
+++ b/model_shared.h
@@ -306,7 +306,7 @@ model_brushq2_t;
 typedef struct model_brushq3_s
 {
        int num_models;
 typedef struct model_brushq3_s
 {
        int num_models;

-       q3mmodel_t *data_models;
+       q3dmodel_t *data_models;

 
        // freed after loading!
        int num_vertices;
 
        // freed after loading!
        int num_vertices;