removed tag override support in .skin files - because Quake3 actually

doesn't do that (it doesn't use the tag names in .skin at all)

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

diff --git a/model_alias.c b/model_alias.c
index 55c62a4533c1fe1224a7f2a6fef41617a50f15f1..307da894d8ab32409934613e16eff4a71b6e675a 100644 (file)
--- a/model_alias.c
+++ b/model_alias.c
@@ -430,10 +430,6 @@ int Mod_Alias_GetTagIndexForName(const model_t *model, unsigned int skin, const
        int i;
        if(skin >= (unsigned int)model->numskins)
                skin = 0;
-       if (model->data_overridetagnamesforskin && skin < (unsigned int)model->numskins && model->data_overridetagnamesforskin[(unsigned int)skin].num_overridetagnames)
-               for (i = 0;i < model->data_overridetagnamesforskin[skin].num_overridetagnames;i++)
-                       if (!strcasecmp(tagname, model->data_overridetagnamesforskin[skin].data_overridetagnames[i].name))
-                               return i + 1;
        if (model->num_bones)
                for (i = 0;i < model->num_bones;i++)
                        if (!strcasecmp(tagname, model->data_bones[i].name))

diff --git a/model_shared.c b/model_shared.c
index 6c41603bfee5c8d9b4d4fcca41769b5a644db351..3be80ec94b72ae96bf19ae35acad9571ee5370d7 100644 (file)
--- a/model_shared.c
+++ b/model_shared.c
@@ -1142,7 +1142,7 @@ static void Q3Shaders_Clear()
        q3shaders_mem = Mem_AllocPool("q3shaders", 0, NULL);
        q3shader_data = (q3shader_data_t*)Mem_Alloc (q3shaders_mem,
                sizeof (q3shader_data_t));
-       Mem_ExpandableArray_NewArray (&q3shader_data->hash_entries, 
+       Mem_ExpandableArray_NewArray (&q3shader_data->hash_entries,
                q3shaders_mem, sizeof (q3shader_hash_entry_t), 256);
        Mem_ExpandableArray_NewArray (&q3shader_data->char_ptrs,
                q3shaders_mem, sizeof (char**), 256);
@@ -1170,7 +1170,7 @@ static void Q3Shader_AddToHash (q3shaderinfo_t* shader)
                        /* Add to chain */
                        q3shader_hash_entry_t* newEntry = (q3shader_hash_entry_t*)
                          Mem_ExpandableArray_AllocRecord (&q3shader_data->hash_entries);
-                       
+
                        while (lastEntry->chain != NULL) lastEntry = lastEntry->chain;
                        lastEntry->chain = newEntry;
                        newEntry->chain = NULL;
@@ -1868,14 +1868,12 @@ nothing                GL_ZERO GL_ONE
 
 skinfile_t *Mod_LoadSkinFiles(void)
 {
-       int i, words, numtags, line, tagsetsused = false, wordsoverflow;
+       int i, words, line, wordsoverflow;
        char *text;
        const char *data;
        skinfile_t *skinfile = NULL, *first = NULL;
        skinfileitem_t *skinfileitem;
        char word[10][MAX_QPATH];
-       overridetagnameset_t tagsets[MAX_SKINS];
-       overridetagname_t tags[256];
 
 /*
 sample file:
@@ -1892,12 +1890,9 @@ tag_head,
 tag_weapon,
 tag_torso,
 */
-       memset(tagsets, 0, sizeof(tagsets));
        memset(word, 0, sizeof(word));
        for (i = 0;i < MAX_SKINS && (data = text = (char *)FS_LoadFile(va("%s_%i.skin", loadmodel->name, i), tempmempool, true, NULL));i++)
        {
-               numtags = 0;
-
                // If it's the first file we parse
                if (skinfile == NULL)
                {
@@ -1949,16 +1944,12 @@ tag_torso,
                                else
                                        Con_Printf("Mod_LoadSkinFiles: parsing error in file \"%s_%i.skin\" on line #%i: wrong number of parameters to command \"%s\", see documentation in DP_GFX_SKINFILES extension in dpextensions.qc\n", loadmodel->name, i, line, word[0]);
                        }
-                       else if (words == 2 && !strcmp(word[1], ","))
+                       else if (words >= 2 && !strncmp(word[0], "tag_", 4))
                        {
                                // tag name, like "tag_weapon,"
-                               if (developer_loading.integer)
-                                       Con_Printf("Mod_LoadSkinFiles: parsed tag #%i \"%s\"\n", numtags, word[0]);
-                               memset(tags + numtags, 0, sizeof(tags[numtags]));
-                               strlcpy (tags[numtags].name, word[0], sizeof (tags[numtags].name));
-                               numtags++;
+                               // not used for anything (not even in Quake3)
                        }
-                       else if (words == 3 && !strcmp(word[1], ","))
+                       else if (words >= 2 && !strcmp(word[1], ","))
                        {
                                // mesh shader name, like "U_RArm,models/players/Legoman/BikerA1.tga"
                                if (developer_loading.integer)
@@ -1973,21 +1964,6 @@ tag_torso,
                                Con_Printf("Mod_LoadSkinFiles: parsing error in file \"%s_%i.skin\" on line #%i: does not look like tag or mesh specification, or replace command, see documentation in DP_GFX_SKINFILES extension in dpextensions.qc\n", loadmodel->name, i, line);
                }
                Mem_Free(text);
-
-               if (numtags)
-               {
-                       overridetagnameset_t *t;
-                       t = tagsets + i;
-                       t->num_overridetagnames = numtags;
-                       t->data_overridetagnames = (overridetagname_t *)Mem_Alloc(loadmodel->mempool, t->num_overridetagnames * sizeof(overridetagname_t));
-                       memcpy(t->data_overridetagnames, tags, t->num_overridetagnames * sizeof(overridetagname_t));
-                       tagsetsused = true;
-               }
-       }
-       if (tagsetsused)
-       {
-               loadmodel->data_overridetagnamesforskin = (overridetagnameset_t *)Mem_Alloc(loadmodel->mempool, i * sizeof(overridetagnameset_t));
-               memcpy(loadmodel->data_overridetagnamesforskin, tagsets, i * sizeof(overridetagnameset_t));
        }
        if (i)
                loadmodel->numskins = i;

diff --git a/model_shared.h b/model_shared.h
index 02d90b9fbd45c2061835de9cebebdc76e7e32446..30a5b771f0cc3b28cae66daa64b4c24cc5973d15 100644 (file)
--- a/model_shared.h
+++ b/model_shared.h
@@ -75,20 +75,6 @@ skinframe_t;
 
 #define MAX_SKINS 256
 
-typedef struct overridetagname_s
-{
-       char name[MAX_QPATH];
-}
-overridetagname_t;
-
-// a replacement set of tag names, per skin
-typedef struct overridetagnameset_s
-{
-       int num_overridetagnames;
-       overridetagname_t *data_overridetagnames;
-}
-overridetagnameset_t;
-
 struct md3vertex_s;
 struct trivertx_s;
 typedef struct texvecvertex_s
@@ -885,8 +871,6 @@ typedef struct model_s
        model_brushq2_t brushq2;
        */
        model_brushq3_t brushq3;
-       // skin files can have different tags for each skin
-       overridetagnameset_t    *data_overridetagnamesforskin;
        // flags this model for offseting sounds to the model center (used by brush models)
        int soundfromcenter;
 }