fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use skin files to replace the skins, instead of add.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1698 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2005-12-12 01:58:15 +00:00
parent c1962bbe77
commit 0ed3044f0f
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
engine/gl/gl_alias.c
View file

@ -4076,7 +4076,9 @@ void GL_LoadQ3Model(model_t *mod, void *buffer)
}
#ifndef SERVERONLY
if (LittleLong(surf->numShaders)+externalskins)
if (externalskins<LittleLong(surf->numShaders))
externalskins = LittleLong(surf->numShaders);
if (externalskins)
{
#ifndef Q3SHADERS
char name[1024];
@ -4088,7 +4090,7 @@ void GL_LoadQ3Model(model_t *mod, void *buffer)
galias->ofsskins = (qbyte *)skin - (qbyte *)galias;
texnum = (galiastexnum_t *)(skin + LittleLong(surf->numShaders)+externalskins);
inshader = (md3Shader_t *)((qbyte *)surf + LittleLong(surf->ofsShaders));
for (i = 0; i < LittleLong(surf->numShaders)+externalskins; i++)
for (i = 0; i < externalskins; i++)
{
skin->texnums = 1;
skin->ofstexnums = (qbyte *)texnum - (qbyte *)skin;
@ -4097,15 +4099,19 @@ void GL_LoadQ3Model(model_t *mod, void *buffer)
skin->skinheight = 0;
skin->skinspeed = 0;
if (i >= LittleLong(surf->numShaders))
shadname[0] = 0;
else
strcpy(shadname, inshader->name);
shadname[0] = '\0';
GL_ParseQ3SkinFile(shadname, surf->name, loadmodel->name, i, skin->name);
if (!*shadname)
{
if (i >= LittleLong(surf->numShaders))
strcpy(shadname, "missingskin"); //this shouldn't be possible
else
strcpy(shadname, inshader->name);
if (!*shadname) //'fix' the shader by looking the surface name up in a skin file. This isn't perfect, but it does the job for basic models.
GL_ParseQ3SkinFile(shadname, surf->name, loadmodel->name, i, skin->name);
else
Q_strncpyz(skin->name, shadname, sizeof(skin->name));
}
#ifdef Q3SHADERS
if (qrenderer)