OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2013-12-01 16:49:55 +01:00
commit 8451cc6e9f
4 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/textures/animations.cpp
View file

@ -778,11 +778,10 @@ void FTextureManager::ParseAnimatedDoor(FScanner &sc)
}
}
frames.Push(v);
if (!sc.CheckString("allowdecals"))
{
Texture(v)->bNoDecals = true;
}
}
else if (!sc.Compare("allowdecals"))
{
if (anim.BaseTexture.Exists()) Texture(anim.BaseTexture)->bNoDecals = true;
}
else
{