From: molivier Date: Mon, 30 Aug 2004 12:03:31 +0000 (+0000) Subject: Fixed the loading of ".skin" files (the skin numbers were reversed) X-Git-Tag: xonotic-v0.1.0preview~5672 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=69bbc931f6a6d22201c5649d93ac0d8893e6e514;p=xonotic%2Fdarkplaces.git Fixed the loading of ".skin" files (the skin numbers were reversed) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4407 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/model_shared.c b/model_shared.c index 17b6e284..9081ccc3 100644 --- a/model_shared.c +++ b/model_shared.c @@ -1085,7 +1085,7 @@ skinfile_t *Mod_LoadSkinFiles(void) int i, words, numtags, line, tagsetsused = false, wordsoverflow; char *text; const char *data; - skinfile_t *skinfile, *first = NULL; + skinfile_t *skinfile = NULL, *first = NULL; skinfileitem_t *skinfileitem; char word[10][MAX_QPATH]; overridetagnameset_t tagsets[MAX_SKINS]; @@ -1111,9 +1111,20 @@ tag_torso, for (i = 0;i < MAX_SKINS && (data = text = FS_LoadFile(va("%s_%i.skin", loadmodel->name, i), tempmempool, true));i++) { numtags = 0; - skinfile = Mem_Alloc(tempmempool, sizeof(skinfile_t)); - skinfile->next = first; - first = skinfile; + + // If it's the first file we parse + if (skinfile == NULL) + { + skinfile = Mem_Alloc(tempmempool, sizeof(skinfile_t)); + first = skinfile; + } + else + { + skinfile->next = Mem_Alloc(tempmempool, sizeof(skinfile_t)); + skinfile = skinfile->next; + } + skinfile->next = NULL; + for(line = 0;;line++) { // parse line