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

Fix _bump texture loading.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6321 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2023-01-09 05:13:05 +00:00
parent 407c4eca8b
commit 6700dfd289
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
engine/client/image.c
View file

@ -303,6 +303,8 @@ static void GenerateXMPData(char *blob, size_t blobsize, int width, int height,
"</rdf:RDF>" "</rdf:RDF>"
"</x:xmpmeta>" "</x:xmpmeta>"
); );
#else
blob[blobsize] = 0;
#endif #endif
} }
#endif #endif
@ -514,7 +516,7 @@ void *ReadTargaFile(qbyte *buf, int length, int *width, int *height, uploadfmt_t
if (greyonly) //grey only, load as 8 bit.. if (greyonly) //grey only, load as 8 bit..
{ {
if (!(tgaheader.version == 1) && !(tgaheader.version == 3)) if (!(tgaheader.version == 1) && !(tgaheader.version == 3) && !(tgaheader.version == 11))
return NULL; return NULL;
} }
if (tgaheader.version == 1 || tgaheader.version == 3) if (tgaheader.version == 1 || tgaheader.version == 3)
@ -13893,8 +13895,6 @@ qboolean Image_LocateHighResTexture(image_t *tex, flocation_t *bestloc, char *be
if (!strcmp(tex_extensions[e].name, ".tga")) if (!strcmp(tex_extensions[e].name, ".tga"))
{ {
Q_snprintfz(fname, sizeof(fname), tex_path[i].path, bumpname, tex_extensions[e].name); Q_snprintfz(fname, sizeof(fname), tex_path[i].path, bumpname, tex_extensions[e].name);
Q_snprintfz(fname, sizeof(fname), tex_path[i].path, nicename, tex_extensions[e].name);
depth = FS_FLocateFile(fname, locflags, &loc); depth = FS_FLocateFile(fname, locflags, &loc);
if (depth < bestdepth) if (depth < bestdepth)
{ {
@ -14085,6 +14085,8 @@ static void Image_LoadHiResTextureWorker(void *ctx, void *data, size_t a, size_t
return; return;
} }
} }
else
Con_Printf(CON_WARNING "%s: bumpmaps must be greyscale tga.\n", fname);
//guess not, fall back to normalmaps //guess not, fall back to normalmaps
} }
#endif #endif