mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-24 21:21:04 +00:00
- restored a line of code I accidentally deleted in FTextureManager::AddTexturesForWad.
SVN r910 (trunk)
This commit is contained in:
parent
a53bfa7113
commit
5afb2b9aab
2 changed files with 8 additions and 2 deletions
|
@ -714,11 +714,11 @@ void FMultiPatchTexture::ParsePatch(FScanner &sc, TexPart & part)
|
||||||
sc.MustGetString();
|
sc.MustGetString();
|
||||||
if (sc.Compare("flipx"))
|
if (sc.Compare("flipx"))
|
||||||
{
|
{
|
||||||
part.Mirror = 1;
|
part.Mirror |= 1;
|
||||||
}
|
}
|
||||||
else if (sc.Compare("flipy"))
|
else if (sc.Compare("flipy"))
|
||||||
{
|
{
|
||||||
part.Mirror = 2;
|
part.Mirror |= 2;
|
||||||
}
|
}
|
||||||
else if (sc.Compare("rotate"))
|
else if (sc.Compare("rotate"))
|
||||||
{
|
{
|
||||||
|
@ -731,6 +731,11 @@ void FMultiPatchTexture::ParsePatch(FScanner &sc, TexPart & part)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (part.Mirror & 2)
|
||||||
|
{
|
||||||
|
part.Rotate = (part.Rotate + 180) % 360;
|
||||||
|
part.Mirror &= 1;
|
||||||
|
}
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -738,6 +738,7 @@ void FTextureManager::AddTexturesForWad(int wadnum)
|
||||||
if (ns == ns_global)
|
if (ns == ns_global)
|
||||||
{
|
{
|
||||||
// In Zips all graphics must be in a separate namespace.
|
// In Zips all graphics must be in a separate namespace.
|
||||||
|
if (Wads.GetLumpFlags(i) & LUMPF_ZIPFILE) continue;
|
||||||
|
|
||||||
// Ignore lumps with empty names.
|
// Ignore lumps with empty names.
|
||||||
if (Wads.CheckLumpName(i, "")) continue;
|
if (Wads.CheckLumpName(i, "")) continue;
|
||||||
|
|
Loading…
Reference in a new issue