From 8edace83c5b089530f6c34814ba08dbb2e748feb Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sat, 25 Oct 2014 10:19:14 +0200
Subject: [PATCH] - made CheatKey and EasyKey vector graphics configurable
 through MAPINFO.

---
 src/am_map.cpp                   | 4 ++--
 src/gi.cpp                       | 3 +++
 src/gi.h                         | 1 +
 wadsrc/static/mapinfo/common.txt | 5 +++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/am_map.cpp b/src/am_map.cpp
index 904593dfb..29cd60793 100644
--- a/src/am_map.cpp
+++ b/src/am_map.cpp
@@ -908,8 +908,8 @@ void AM_StaticInit()
 
 	if (gameinfo.mMapArrow.IsNotEmpty()) AM_ParseArrow(MapArrow, gameinfo.mMapArrow);
 	if (gameinfo.mCheatMapArrow.IsNotEmpty()) AM_ParseArrow(CheatMapArrow, gameinfo.mCheatMapArrow);
-	AM_ParseArrow(CheatKey, "maparrows/key.txt");
-	AM_ParseArrow(EasyKey, "maparrows/ravenkey.txt");
+	AM_ParseArrow(CheatKey, gameinfo.mCheatKey);
+	AM_ParseArrow(EasyKey, gameinfo.mEasyKey);
 	if (MapArrow.Size() == 0) I_FatalError("No automap arrow defined");
 
 	char namebuf[9];
diff --git a/src/gi.cpp b/src/gi.cpp
index 4e64dd425..a17e97631 100644
--- a/src/gi.cpp
+++ b/src/gi.cpp
@@ -290,6 +290,9 @@ void FMapInfoParser::ParseGameInfo()
 			else gameinfo.mCheatMapArrow = "";
 		}
 		// Insert valid keys here.
+		GAMEINFOKEY_STRING(mCheatKey, "cheatKey")
+		GAMEINFOKEY_STRING(mEasyKey, "easyKey")
+		GAMEINFOKEY_STRING(TitlePage, "titlePage")
 		GAMEINFOKEY_STRING(TitlePage, "titlePage")
 		GAMEINFOKEY_STRINGARRAY(creditPages, "addcreditPage", 8, false)
 		GAMEINFOKEY_STRINGARRAY(creditPages, "CreditPage", 8, true)
diff --git a/src/gi.h b/src/gi.h
index bbfbe73ff..d8d19a14b 100644
--- a/src/gi.h
+++ b/src/gi.h
@@ -169,6 +169,7 @@ struct gameinfo_t
 	int TextScreenY;
 	FName DefaultEndSequence;
 	FString mMapArrow, mCheatMapArrow;
+	FString mEasyKey, mCheatKey;
 	FGIFont mStatscreenMapNameFont;
 	FGIFont mStatscreenFinishedFont;
 	FGIFont mStatscreenEnteringFont;
diff --git a/wadsrc/static/mapinfo/common.txt b/wadsrc/static/mapinfo/common.txt
index 8e7886987..fc6379d01 100644
--- a/wadsrc/static/mapinfo/common.txt
+++ b/wadsrc/static/mapinfo/common.txt
@@ -1,3 +1,8 @@
+Gameinfo
+{
+	CheatKey = "maparrows/key.txt"
+	EasyKey = "maparrows/ravenkey.txt"
+}
 
 Intermission Inter_Titlescreen
 {