OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: When FTextureManager::CheckForTexture finds a matching NULL texture

Browse source 
it should always return 0, not the actual texture's index.


SVN r979 (trunk)
This commit is contained in:
Christoph Oelckers 2008-05-17 23:41:51 +00:00
commit b8c21495d5
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/textures/texturemanager.cpp
View file

@ -125,6 +125,11 @@ int FTextureManager::CheckForTexture (const char *name, int usetype, BITFIELD fl
{
return i;
}
else if (tex->UseType == FTexture::TEX_Null && usetype == FTexture::TEX_Wall)
{
// We found a NULL texture on a wall -> return 0
return 0;
}
else
{
if (firsttype == FTexture::TEX_Null ||
@ -141,6 +146,8 @@ int FTextureManager::CheckForTexture (const char *name, int usetype, BITFIELD fl
if ((flags & TEXMAN_TryAny) && usetype != FTexture::TEX_Any)
{
// Never return the index of NULL textures.
if (firsttype == FTexture::TEX_Null) return 0;
return firstfound;
}