From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 9 Aug 2010 06:40:45 +0000 (+0000)
Subject: Mod_BuildAliasSkinsFromSkinFile: strip image extension
X-Git-Tag: xonotic-v0.1.0preview~230^2~100
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a3274001092b6ea07a9efecf94289cc7a3e6f7f8;p=xonotic%2Fdarkplaces.git

Mod_BuildAliasSkinsFromSkinFile: strip image extension

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

diff --git a/model_alias.c b/model_alias.c
index 9cf5e50c..ae33b14f 100644
--- a/model_alias.c
+++ b/model_alias.c
@@ -955,6 +955,7 @@ static void Mod_BuildAliasSkinFromSkinFrame(texture_t *texture, skinframe_t *ski
 void Mod_BuildAliasSkinsFromSkinFiles(texture_t *skin, skinfile_t *skinfile, const char *meshname, const char *shadername)
 {
 	int i;
+	static char stripbuf[MAX_QPATH];
 	skinfileitem_t *skinfileitem;
 	if (skinfile)
 	{
@@ -968,7 +969,8 @@ void Mod_BuildAliasSkinsFromSkinFiles(texture_t *skin, skinfile_t *skinfile, con
 				// leave the skin unitialized (nodraw) if the replacement is "common/nodraw" or "textures/common/nodraw"
 				if (!strcmp(skinfileitem->name, meshname))
 				{
-					Mod_LoadTextureFromQ3Shader(skin, skinfileitem->replacement, true, true, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PICMIP | TEXF_COMPRESS);
+					Image_StripImageExtension(skinfileitem->replacement, stripbuf, sizeof(stripbuf));
+					Mod_LoadTextureFromQ3Shader(skin, stripbuf, true, true, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PICMIP | TEXF_COMPRESS);
 					break;
 				}
 			}
@@ -981,7 +983,10 @@ void Mod_BuildAliasSkinsFromSkinFiles(texture_t *skin, skinfile_t *skinfile, con
 		}
 	}
 	else
-		Mod_LoadTextureFromQ3Shader(skin, shadername, true, true, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PICMIP | TEXF_COMPRESS);
+	{
+		Image_StripImageExtension(shadername, stripbuf, sizeof(stripbuf));
+		Mod_LoadTextureFromQ3Shader(skin, stripbuf, true, true, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PICMIP | TEXF_COMPRESS);
+	}
 }
 
 #define BOUNDI(VALUE,MIN,MAX) if (VALUE < MIN || VALUE >= MAX) Host_Error("model %s has an invalid ##VALUE (%d exceeds %d - %d)", loadmodel->name, VALUE, MIN, MAX);