mirror of
https://github.com/ZDoom/qzdoom-gpl.git
synced 2024-11-28 14:42:23 +00:00
Merge branch 'master' of https://github.com/rheit/zdoom
This commit is contained in:
commit
7ba0f2467a
1 changed files with 6 additions and 3 deletions
|
@ -749,7 +749,10 @@ void FTextureManager::ParseAnimatedDoor(FScanner &sc)
|
||||||
{
|
{
|
||||||
error = true;
|
error = true;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Texture(anim.BaseTexture)->bNoDecals = true;
|
||||||
|
}
|
||||||
while (sc.GetString())
|
while (sc.GetString())
|
||||||
{
|
{
|
||||||
if (sc.Compare ("opensound"))
|
if (sc.Compare ("opensound"))
|
||||||
|
@ -781,7 +784,7 @@ void FTextureManager::ParseAnimatedDoor(FScanner &sc)
|
||||||
}
|
}
|
||||||
else if (sc.Compare("allowdecals"))
|
else if (sc.Compare("allowdecals"))
|
||||||
{
|
{
|
||||||
if (anim.BaseTexture.Exists()) Texture(anim.BaseTexture)->bNoDecals = true;
|
if (anim.BaseTexture.Exists()) Texture(anim.BaseTexture)->bNoDecals = false;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue