From ba106c28c4f8ea7c888085a84123bda6467977be Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sun, 13 Dec 2009 22:22:25 +0000
Subject: [PATCH] - fixed: old-style DECORATE definitions with non-alphanumeric
 characters in   the name produced an error.

SVN r2025 (trunk)
---
 docs/rh-log.txt                 | 4 ++++
 src/textures/warptexture.cpp    | 2 +-
 src/thingdef/thingdef_parse.cpp | 3 ---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 19dc7f7d1..7a3c73ad1 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,7 @@
+December 13, 2009  (Changes by Graf Zahl)
+- fixed: old-style DECORATE definitions with non-alphanumeric characters in
+  the name produced an error.
+
 December 12, 2009
 - Added a DMG_NO_FACTOR flag for P_DamageMobj(). A_KillChildren, A_KillMaster,
   and A_KillSiblings now use it.
diff --git a/src/textures/warptexture.cpp b/src/textures/warptexture.cpp
index f87688ea1..360d1d38a 100644
--- a/src/textures/warptexture.cpp
+++ b/src/textures/warptexture.cpp
@@ -229,7 +229,7 @@ void FWarp2Texture::MakeTexture (DWORD time)
 
 FTexture *FWarpTexture::GetRedirect(bool wantwarped)
 {
-	if (!wantwarped) return SourcePic;
+	if (!wantwarped) return SourcePic->GetRedirect(false);
 	else return this;
 }
 
diff --git a/src/thingdef/thingdef_parse.cpp b/src/thingdef/thingdef_parse.cpp
index cc9b3284c..4aea677aa 100644
--- a/src/thingdef/thingdef_parse.cpp
+++ b/src/thingdef/thingdef_parse.cpp
@@ -1229,9 +1229,6 @@ void ParseDecorate (FScanner &sc)
 				break;
 			}
 		default:
-			// without the option of game filters following, anything but an opening brace
-			// here means a syntax error.
-			sc.MustGetStringName("{");
 			sc.RestorePos(pos);
 			ParseOldDecoration(sc, DEF_Decoration);
 			break;