team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

This needs a proper fix some time, but I don't want to be the one to do it, it's hideous! Hrm, colormap stuff... I dunno. This works well enough for most q3 mods. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2122 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2006-03-15 20:07:43 +00:00
parent ea14d7facc
commit eda0633c4e
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engine/gl/gl_alias.c
View File

@ -1274,7 +1274,11 @@ static galiastexnum_t *GL_ChooseSkin(galiasinfo_t *inf, char *modelname, int sur
if (e->skinnum >= 0 && e->skinnum < inf->numskins)
skins += e->skinnum;
else
{
Con_DPrintf("Skin number out of range\n");
if (!inf->numskins)
return NULL;
}
if (!skins->texnums)
return NULL;
@ -2863,8 +2867,13 @@ int GL_BuildSkinFileList(char *modelname)
}
}
COM_EnumerateFiles(va("%s_*.skin", modelname), GL_EnumerateSkins, NULL);
COM_EnumerateFiles(va("%s_*.skin", skinfilename), GL_EnumerateSkins, NULL);
// if (strstr(modelname, "lower") || strstr(modelname, "upper") || strstr(modelname, "head"))
// {
COM_EnumerateFiles(va("%s_*.skin", modelname), GL_EnumerateSkins, NULL);
COM_EnumerateFiles(va("%s_*.skin", skinfilename), GL_EnumerateSkins, NULL);
// }
// else
// COM_EnumerateFiles("*.skin", GL_EnumerateSkins, NULL);
return skinfilecount;
}