From 4f7ec3ad891d556c0d3f680e209a120ed38e9cdb Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <c.oelckers@zdoom.fake>
Date: Fri, 3 Apr 2015 22:23:42 +0200
Subject: [PATCH] - print proper information about non-actor mapthings.

---
 src/g_doomedmap.cpp | 15 +++++++++++++--
 src/gi.cpp          |  1 -
 src/gi.h            |  1 -
 src/p_buildmap.cpp  |  2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/g_doomedmap.cpp b/src/g_doomedmap.cpp
index ad61e1bf76..c3e586bc20 100644
--- a/src/g_doomedmap.cpp
+++ b/src/g_doomedmap.cpp
@@ -113,8 +113,19 @@ CCMD (dumpmapthings)
 
 		for (unsigned i = 0; i < infos.Size (); ++i)
 		{
-			Printf ("%6d %s\n",
-				infos[i]->Key, infos[i]->Value.Type->TypeName.GetChars());
+			if (infos[i]->Value.Type != NULL)
+			{
+				Printf("%6d %s\n", infos[i]->Key, infos[i]->Value.Type->TypeName.GetChars());
+			}
+			else if (infos[i]->Value.Special > 0)
+			{
+				Printf("%6d %s\n", infos[i]->Key, SpecialMapthingNames[infos[i]->Value.Special - 1]);
+			}
+			else
+			{
+				Printf("%6d none", infos[i]->Key);
+			}
+
 		}
 	}
 }
diff --git a/src/gi.cpp b/src/gi.cpp
index b0edf2a041..ac38188705 100644
--- a/src/gi.cpp
+++ b/src/gi.cpp
@@ -335,7 +335,6 @@ void FMapInfoParser::ParseGameInfo()
 		GAMEINFOKEY_INT(defaultrespawntime, "defaultrespawntime")
 		GAMEINFOKEY_INT(defaultdropstyle, "defaultdropstyle")
 		GAMEINFOKEY_STRING(Endoom, "endoom")
-		GAMEINFOKEY_INT(player5start, "player5start")
 		GAMEINFOKEY_STRINGARRAY(quitmessages, "addquitmessages", 0, false)
 		GAMEINFOKEY_STRINGARRAY(quitmessages, "quitmessages", 0, true)
 		GAMEINFOKEY_STRING(mTitleColor, "menufontcolor_title")
diff --git a/src/gi.h b/src/gi.h
index d8d19a14bc..490981f775 100644
--- a/src/gi.h
+++ b/src/gi.h
@@ -153,7 +153,6 @@ struct gameinfo_t
 	int definventorymaxamount;
 	int defaultrespawntime;
 	int defaultdropstyle;
-	int player5start;
 	DWORD pickupcolor;
 	TArray<FString> quitmessages;
 	FName mTitleColor;
diff --git a/src/p_buildmap.cpp b/src/p_buildmap.cpp
index 2ee2ae83a8..c12c79608f 100644
--- a/src/p_buildmap.cpp
+++ b/src/p_buildmap.cpp
@@ -723,7 +723,7 @@ static int LoadSprites (spritetype *sprites, Xsprite *xsprites, int numsprites,
 			if (xsprites[i].Data1 < 4)
 				mapthings[count].type = 1 + xsprites[i].Data1;
 			else
-				mapthings[count].type = gameinfo.player5start + xsprites[i].Data1 - 4;
+				mapthings[count].type = 4001 + xsprites[i].Data1 - 4;
 		}
 		else if (xsprites != NULL && sprites[i].lotag == 2)
 		{ // Bloodbath start