zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Changed FTextureManager::CheckForTexture() search algorithm so that inexact matches on

Browse source 
textures of type TEX_MiscPatch will return the first such texture, as it does with all
  the other types. (It will still prefer to return a texture of a different type.
  Why are these treated differently, anyway?)

SVN r2251 (trunk)
This commit is contained in:
Randy Heit 2010-03-28 03:46:46 +00:00
parent 72e9a870c2
commit 70c21c8314
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/textures/texturemanager.cpp
View file

@ -140,7 +140,9 @@ FTextureID FTextureManager::CheckForTexture (const char *name, int usetype, BITF
else
{
if (firsttype == FTexture::TEX_Null ||
(firsttype == FTexture::TEX_MiscPatch && tex->UseType != FTexture::TEX_Null)
(firsttype == FTexture::TEX_MiscPatch &&
tex->UseType != firsttype &&
tex->UseType != FTexture::TEX_Null)
)
{
firstfound = i;