From 387bfc0260566d3c4cbcf96d0be1aab45a7a3896 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sat, 28 Aug 2010 17:19:48 +0000
Subject: [PATCH] - added 'nospriterename' key to GAMEINFO lump so that PWADs
 have a means to disable this feature without having to specify a command line
 switch.

SVN r2623 (trunk)
---
 src/d_main.cpp | 5 +++++
 src/w_wad.cpp  | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/d_main.cpp b/src/d_main.cpp
index 20ba2c4675..19ed60437c 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -201,6 +201,7 @@ gamestate_t wipegamestate = GS_DEMOSCREEN;	// can be -1 to force a wipe
 bool PageBlank;
 FTexture *Page;
 FTexture *Advisory;
+bool nospriterename;
 
 cycle_t FrameCycles;
 
@@ -1678,6 +1679,10 @@ static FString ParseGameInfo(TArray<FString> &pwads, const char *fn, const char
 			}
 			while (sc.CheckToken(','));
 		}
+		else if (!nextKey.CompareNoCase("NOSPRITERENAME"))
+		{
+			nospriterename = true;
+		}
 	}
 	return iwad;
 }
diff --git a/src/w_wad.cpp b/src/w_wad.cpp
index 5727c8bcc7..13e7ff14a2 100644
--- a/src/w_wad.cpp
+++ b/src/w_wad.cpp
@@ -70,6 +70,7 @@ struct FWadCollection::LumpRecord
 };
 
 // EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
+extern bool nospriterename;
 
 // PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
 
@@ -759,7 +760,7 @@ void FWadCollection::RenameSprites ()
 		}
 	}
 
-	renameAll = !!Args->CheckParm ("-oldsprites");
+	renameAll = !!Args->CheckParm ("-oldsprites") || nospriterename;
 	
 	for (DWORD i = 0; i < LumpInfo.Size(); i++)
 	{