OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: The particle fountains' names were different than before

Browse source 
- Fixed: FTexture::CheckForTexture should return NULL if the texture it
  finds is of type FTexture::TEX_Null. If this isn't done not all occurences
  of AASHITTY being used to silence an editor's error checker will be handled
  correctly. In particular the transparent door trick will break.


SVN r411 (trunk)
This commit is contained in:
Christoph Oelckers 2006-12-14 11:44:49 +00:00
commit 08a1ffce23
3 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/r_data.cpp
View file

@ -116,7 +116,8 @@ int FTextureManager::CheckForTexture (const char *name, int usetype, BITFIELD fl
// The name matches, so check the texture type
if (usetype == FTexture::TEX_Any)
{
return i;
// All NULL textures should actually return 0
return tex->UseType==FTexture::TEX_Null? 0 : i;
}
else if ((flags & TEXMAN_Overridable) && tex->UseType == FTexture::TEX_Override)
{