nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-11 07:01:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed per-map replacement textures getting used on the wrong maps, by loading them with a prefixed name, hurrah!

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1294 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2005-09-08 02:04:02 +00:00
parent 822ea1c963
commit f1fb6ee26b
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
engine/client/image.c
View file

@ -1802,6 +1802,7 @@ qbyte *Read32BitImageFile(qbyte *buf, int len, int *width, int *height)
int image_width, image_height; int image_width, image_height;
qbyte *COM_LoadFile (char *path, int usehunk); qbyte *COM_LoadFile (char *path, int usehunk);
//fixme: should probably get rid of the 'Mod' prefix, and use something more suitable.
int Mod_LoadHiResTexture(char *name, char *subpath, qboolean mipmap, qboolean alpha, qboolean colouradjust) int Mod_LoadHiResTexture(char *name, char *subpath, qboolean mipmap, qboolean alpha, qboolean colouradjust)
{ {
qboolean alphaed; qboolean alphaed;
@ -1825,7 +1826,7 @@ int Mod_LoadHiResTexture(char *name, char *subpath, qboolean mipmap, qboolean al
static char *path[] ={ static char *path[] ={
"%s%s", "%s%s",
"textures/%s/%s%s", //this is special... It uses the subpath parameter. "textures/%s/%s%s", //this is special... It uses the subpath parameter. Note references to (i == 1)
"textures/%s%s", "textures/%s%s",
"override/%s%s" "override/%s%s"
}; };
@ -1841,6 +1842,12 @@ int Mod_LoadHiResTexture(char *name, char *subpath, qboolean mipmap, qboolean al
if ((len = GL_FindTexture(name))!=-1) //don't bother if it already exists. if ((len = GL_FindTexture(name))!=-1) //don't bother if it already exists.
return len; return len;
if (subpath && *subpath)
{
_snprintf(fname, sizeof(fname)-1, "%s/%s", subpath, name);
if ((len = GL_FindTexture(fname))!=-1) //don't bother if it already exists.
return len;
}
if ((len = GL_LoadCompressed(name))) if ((len = GL_LoadCompressed(name)))
return len; return len;
@ -1858,7 +1865,7 @@ int Mod_LoadHiResTexture(char *name, char *subpath, qboolean mipmap, qboolean al
{ {
if (!subpath) if (!subpath)
continue; continue;
_snprintf(fname, sizeof(fname)-1, path[i], subpath, COM_SkipPath(nicename), ".dds"); _snprintf(fname, sizeof(fname)-1, path[i], subpath, /*COM_SkipPath*/(nicename), ".dds");
} }
else else
_snprintf(fname, sizeof(fname)-1, path[i], nicename, ".dds"); _snprintf(fname, sizeof(fname)-1, path[i], nicename, ".dds");
@ -1877,7 +1884,7 @@ int Mod_LoadHiResTexture(char *name, char *subpath, qboolean mipmap, qboolean al
{ {
if (!subpath) if (!subpath)
continue; continue;
_snprintf(fname, sizeof(fname)-1, path[i], subpath, COM_SkipPath(nicename), extensions[e]); _snprintf(fname, sizeof(fname)-1, path[i], subpath, /*COM_SkipPath*/(nicename), extensions[e]);
} }
else else
_snprintf(fname, sizeof(fname)-1, path[i], nicename, extensions[e]); _snprintf(fname, sizeof(fname)-1, path[i], nicename, extensions[e]);
@ -1890,6 +1897,12 @@ int Mod_LoadHiResTexture(char *name, char *subpath, qboolean mipmap, qboolean al
if (colouradjust && !vid_hardwaregamma.value) if (colouradjust && !vid_hardwaregamma.value)
BoostGamma(data, image_width, image_height); BoostGamma(data, image_width, image_height);
TRACE(("dbg: Mod_LoadHiResTexture: %s loaded\n", name)); TRACE(("dbg: Mod_LoadHiResTexture: %s loaded\n", name));
if (i == 1)
{ //if it came from a special subpath (eg: map specific), upload it using the subpath prefix
_snprintf(fname, sizeof(fname)-1, "%s/%s", subpath, name);
len = GL_LoadTexture32 (fname, image_width, image_height, (unsigned*)data, mipmap, alpha);
}
else
len = GL_LoadTexture32 (name, image_width, image_height, (unsigned*)data, mipmap, alpha); len = GL_LoadTexture32 (name, image_width, image_height, (unsigned*)data, mipmap, alpha);
BZ_Free(data); BZ_Free(data);