From 9c529b8aa4efaaa0a70f680e7de076503ed0d749 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sun, 5 Nov 2006 15:49:54 +0000
Subject: [PATCH] - Removed the deprecation warnings for the state assignment
 commands   in DECORATE. While it is still recommended not to use them anymore
   they will continue to work with custom state support and existing  
 DECORATE code doesn't have to be changed. However, they will remain   limited
 to the existing functionality, nothing more.

SVN r377 (trunk)
---
 docs/rh-log.txt           |  7 +++++++
 src/g_doom/a_doomglobal.h | 10 ----------
 src/thingdef.cpp          |  7 +++----
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index cb5ba50c2..9845d7203 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,10 @@
+November 5, 2006 (Changes by Graf Zahl)
+- Removed the deprecation warnings for the state assignment commands
+  in DECORATE. While it is still recommended not to use them anymore
+  they will continue to work with custom state support and existing 
+  DECORATE code doesn't have to be changed. However, they will remain
+  limited to the existing functionality, nothing more.
+
 November 4, 2006 (Changes by Graf Zahl)
 - Replaced the static string buffer in ProcessStates with an FString.
 - After doing some tests with state label scopes I had to conclude that
diff --git a/src/g_doom/a_doomglobal.h b/src/g_doom/a_doomglobal.h
index be1063955..c522b45b9 100644
--- a/src/g_doom/a_doomglobal.h
+++ b/src/g_doom/a_doomglobal.h
@@ -16,16 +16,6 @@ class ARocket : public AActor
 public:
 };
 
-class AArchvile : public AActor
-{
-	DECLARE_ACTOR (AArchvile, AActor)
-};
-
-class ALostSoul : public AActor
-{
-	DECLARE_ACTOR (ALostSoul, AActor)
-};
-
 class APlasmaBall : public AActor
 {
 	DECLARE_ACTOR (APlasmaBall, AActor)
diff --git a/src/thingdef.cpp b/src/thingdef.cpp
index c8bfa77b1..753f7870a 100644
--- a/src/thingdef.cpp
+++ b/src/thingdef.cpp
@@ -2474,16 +2474,14 @@ void ProcessActor(void (*process)(FState *, int))
 //
 // StatePropertyIsDeprecated
 //
-// Deprecated means it will be removed in a future version.
-//
 //==========================================================================
 
 static void StatePropertyIsDeprecated (const char *actorname, const char *prop)
 {
+	/*
 	static bool warned = false;
 
-	Printf (TEXTCOLOR_YELLOW "In actor %s, the %s property is deprecated and will be removed in 2.2.0.\n",
-		actorname, prop);
+	Printf (TEXTCOLOR_YELLOW "In actor %s, the %s property is deprecated.\n", actorname, prop);
 	if (!warned)
 	{
 		warned = true;
@@ -2491,6 +2489,7 @@ static void StatePropertyIsDeprecated (const char *actorname, const char *prop)
 				TEXTCOLOR_YELLOW "    %s:\n"
 				TEXTCOLOR_YELLOW "        Goto <state>\n", prop, prop);
 	}
+	*/
 }
 
 //==========================================================================