removed texture_t->number and q3mtexture_t->number

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

diff --git a/model_brush.c b/model_brush.c
index 44c41917a2cf0a326bd59003325800855cd0fdf3..1c59cf953c1d4805bcb609feeb184899ee26ad6d 100644 (file)
--- a/model_brush.c
+++ b/model_brush.c
@@ -986,7 +986,6 @@ static void Mod_Q1BSP_LoadTextures(lump_t *l)
        // fill out all slots with notexture
        for (i = 0, tx = loadmodel->brushq1.textures;i < loadmodel->brushq1.numtextures;i++, tx++)
        {
        // fill out all slots with notexture
        for (i = 0, tx = loadmodel->brushq1.textures;i < loadmodel->brushq1.numtextures;i++, tx++)
        {

-               tx->number = i;

                strcpy(tx->name, "NO TEXTURE FOUND");
                tx->width = 16;
                tx->height = 16;
                strcpy(tx->name, "NO TEXTURE FOUND");
                tx->width = 16;
                tx->height = 16;


@@ -3696,7 +3695,6 @@ static void Mod_Q3BSP_LoadTextures(lump_t *l)
 
        for (i = 0;i < count;i++, in++, out++)
        {
 
        for (i = 0;i < count;i++, in++, out++)
        {

-               out->number = i;

                strlcpy (out->name, in->name, sizeof (out->name));
                out->surfaceflags = LittleLong(in->surfaceflags);
                out->supercontents = Mod_Q3BSP_SuperContentsFromNativeContents(loadmodel, LittleLong(in->contents));
                strlcpy (out->name, in->name, sizeof (out->name));
                out->surfaceflags = LittleLong(in->surfaceflags);
                out->supercontents = Mod_Q3BSP_SuperContentsFromNativeContents(loadmodel, LittleLong(in->contents));

diff --git a/model_brush.h b/model_brush.h
index c7898863df1bfe9ccb9ceba63e268184e91d5764..535676822fdd0a341154b360c99b852311fc2095 100644 (file)
--- a/model_brush.h
+++ b/model_brush.h
@@ -86,9 +86,6 @@ typedef struct texture_s
        // SURF_ flags
        unsigned int flags;
 
        // SURF_ flags
        unsigned int flags;
 

-       // position in the model's textures array
-       int number;
-

        // type of rendering (SURFRENDER_ value)
        int rendertype;
 
        // type of rendering (SURFRENDER_ value)
        int rendertype;
 


@@ -784,12 +781,7 @@ typedef struct q3mtexture_s
        int surfaceparms;
        int textureflags;
 
        int surfaceparms;
        int textureflags;
 

-       int number;

        skinframe_t skin;
        skinframe_t skin;

-
-       int numfaces;
-       struct q3msurface_s **facelist;
-       int *facenumlist;

 }
 q3mtexture_t;
 
 }
 q3mtexture_t;