From 5afb2b9aabccb509bd49502c735cf5f9c61e3368 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sun, 13 Apr 2008 14:27:58 +0000
Subject: [PATCH] - restored a line of code I accidentally deleted in
 FTextureManager::AddTexturesForWad.

SVN r910 (trunk)
---
 src/textures/multipatchtexture.cpp | 9 +++++++--
 src/textures/texturemanager.cpp    | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/textures/multipatchtexture.cpp b/src/textures/multipatchtexture.cpp
index 96caa452e..57956a2ba 100644
--- a/src/textures/multipatchtexture.cpp
+++ b/src/textures/multipatchtexture.cpp
@@ -714,11 +714,11 @@ void FMultiPatchTexture::ParsePatch(FScanner &sc, TexPart & part)
 			sc.MustGetString();
 			if (sc.Compare("flipx"))
 			{
-				part.Mirror = 1;
+				part.Mirror |= 1;
 			}
 			else if (sc.Compare("flipy"))
 			{
-				part.Mirror = 2;
+				part.Mirror |= 2;
 			}
 			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;
+	}
 	*/
 }
 
diff --git a/src/textures/texturemanager.cpp b/src/textures/texturemanager.cpp
index 0fe074397..6ede2bb04 100644
--- a/src/textures/texturemanager.cpp
+++ b/src/textures/texturemanager.cpp
@@ -738,6 +738,7 @@ void FTextureManager::AddTexturesForWad(int wadnum)
 		if (ns == ns_global)
 		{
 			// In Zips all graphics must be in a separate namespace.
+			if (Wads.GetLumpFlags(i) & LUMPF_ZIPFILE) continue;
 
 			// Ignore lumps with empty names.
 			if (Wads.CheckLumpName(i, "")) continue;