From 6d3e2396786ae03e3ac3a1ac0d5932a5e68414ab Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sat, 3 Nov 2007 11:56:30 +0000
Subject: [PATCH] - Changed names of skill properties to be the same as for
 episodes if possible.

SVN r560 (trunk)
---
 src/g_level.cpp               |  6 +++---
 wadsrc/mapinfo/doomcommon.txt | 20 ++++++++++----------
 wadsrc/mapinfo/heretic.txt    | 10 +++++-----
 wadsrc/mapinfo/hexen.txt      | 10 +++++-----
 wadsrc/mapinfo/strife.txt     | 20 ++++++++++----------
 5 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/g_level.cpp b/src/g_level.cpp
index 24ebf9aa74..edd82fa2d2 100644
--- a/src/g_level.cpp
+++ b/src/g_level.cpp
@@ -3105,7 +3105,7 @@ static void ParseSkill ()
 			SC_MustGetNumber ();
 			skill.ACSReturn = sc_Number;
 		}
-		else if (SC_Compare("MenuName"))
+		else if (SC_Compare("Name"))
 		{
 			SC_MustGetString ();
 			skill.MenuName = sc_String;
@@ -3118,7 +3118,7 @@ static void ParseSkill ()
 			SC_MustGetString ();
 			skill.MenuNamesForPlayerClass[pc]=sc_String;
 		}
-		else if (SC_Compare("MenuLump"))
+		else if (SC_Compare("PicName"))
 		{
 			SC_MustGetString ();
 			skill.MenuName = sc_String;
@@ -3128,7 +3128,7 @@ static void ParseSkill ()
 		{
 			skill.MustConfirm = true;
 		}
-		else if (SC_Compare("Shortcut"))
+		else if (SC_Compare("Key"))
 		{
 			SC_MustGetString();
 			skill.shortcut = tolower(sc_String[0]);
diff --git a/wadsrc/mapinfo/doomcommon.txt b/wadsrc/mapinfo/doomcommon.txt
index 32618cddde..c205cab6ec 100644
--- a/wadsrc/mapinfo/doomcommon.txt
+++ b/wadsrc/mapinfo/doomcommon.txt
@@ -3,23 +3,23 @@ skill baby
 	DamageFactor 0.5
 	EasyBossBrain
 	SpawnFilter "Easy"
-	MenuLump "M_JKILL"
-	Shortcut i
+	PicName "M_JKILL"
+	Key i
 
 skill easy
 	SpawnFilter "Easy"
-	MenuLump "M_ROUGH"
-	Shortcut h
+	PicName "M_ROUGH"
+	Key h
 
 skill normal
 	SpawnFilter "Normal"
-	MenuLump "M_HURT"
-	Shortcut h
+	PicName "M_HURT"
+	Key h
 
 skill hard
 	SpawnFilter "Normal"
-	MenuLump "M_ULTRA"
-	Shortcut u
+	PicName "M_ULTRA"
+	Key u
 
 skill nightmare
 	AmmoFactor 2
@@ -27,6 +27,6 @@ skill nightmare
 	DisableCheats
 	RespawnTime 12
 	SpawnFilter "Hard"
-	MenuLump "M_NMARE"
+	PicName "M_NMARE"
 	MustConfirm
-	Shortcut n
+	Key n
diff --git a/wadsrc/mapinfo/heretic.txt b/wadsrc/mapinfo/heretic.txt
index b2354c3be5..0c911de3f4 100644
--- a/wadsrc/mapinfo/heretic.txt
+++ b/wadsrc/mapinfo/heretic.txt
@@ -5,26 +5,26 @@ skill baby
 	DamageFactor 0.5
 	EasyBossBrain
 	SpawnFilter "Easy"
-	MenuName "MNU_WETNURSE"
+	Name "MNU_WETNURSE"
 
 skill easy
 	SpawnFilter "Easy"
-	MenuName "MNU_YELLOWBELLIES"
+	Name "MNU_YELLOWBELLIES"
 
 skill normal
 	SpawnFilter "Normal"
-	MenuName "MNU_BRINGEST"
+	Name "MNU_BRINGEST"
 
 skill hard
 	SpawnFilter "Normal"
-	MenuName "MNU_SMITE"
+	Name "MNU_SMITE"
 
 skill nightmare
 	AmmoFactor 1.5
 	FastMonsters
 	DisableCheats
 	SpawnFilter "Hard"
-	MenuName "MNU_BLACKPLAGUE"
+	Name "MNU_BLACKPLAGUE"
 	MustConfirm
 
 
diff --git a/wadsrc/mapinfo/hexen.txt b/wadsrc/mapinfo/hexen.txt
index ffea307289..b9563b1f1e 100644
--- a/wadsrc/mapinfo/hexen.txt
+++ b/wadsrc/mapinfo/hexen.txt
@@ -6,7 +6,7 @@ skill baby
 	DamageFactor 0.5
 	EasyBossBrain
 	SpawnFilter "Easy"
-	MenuName "MNU_WETNURSE"
+	Name "MNU_WETNURSE"
 	PlayerClassName "fighter" "MNU_SQUIRE"
 	PlayerClassName "cleric" "MNU_ALTARBOY"
 	PlayerClassName "mage" "MNU_APPRENTICE"
@@ -14,21 +14,21 @@ skill baby
 
 skill easy
 	SpawnFilter "Easy"
-	MenuName "MNU_YELLOWBELLIES"
+	Name "MNU_YELLOWBELLIES"
 	PlayerClassName "fighter" "MNU_KNIGHT"
 	PlayerClassName "cleric" "MNU_ACOLYTE"
 	PlayerClassName "mage" "MNU_ENCHANTER"
 
 skill normal
 	SpawnFilter "Normal"
-	MenuName "MNU_BRINGEST"
+	Name "MNU_BRINGEST"
 	PlayerClassName "fighter" "MNU_WARRIOR"
 	PlayerClassName "cleric" "MNU_PRIEST"
 	PlayerClassName "mage" "MNU_SORCERER"
 
 skill hard
 	SpawnFilter "Normal"
-	MenuName "MNU_SMITE"
+	Name "MNU_SMITE"
 	PlayerClassName "fighter" "MNU_BERSERKER"
 	PlayerClassName "cleric" "MNU_CARDINAL"
 	PlayerClassName "mage" "MNU_WARLOCK"
@@ -38,7 +38,7 @@ skill nightmare
 	FastMonsters
 	DisableCheats
 	SpawnFilter "Hard"
-	MenuName "MNU_BLACKPLAGUE"
+	Name "MNU_BLACKPLAGUE"
 	PlayerClassName "fighter" "MNU_TITAN"
 	PlayerClassName "cleric" "MNU_POPE"
 	PlayerClassName "mage" "MNU_ARCHMAGE"
diff --git a/wadsrc/mapinfo/strife.txt b/wadsrc/mapinfo/strife.txt
index d81755931d..a6f9ace352 100644
--- a/wadsrc/mapinfo/strife.txt
+++ b/wadsrc/mapinfo/strife.txt
@@ -5,23 +5,23 @@ skill baby
 	DamageFactor 0.5
 	EasyBossBrain
 	SpawnFilter "Easy"
-	MenuLump "M_JKILL"
-	Shortcut t
+	PicName "M_JKILL"
+	Key t
 
 skill easy
 	SpawnFilter "Easy"
-	MenuLump "M_ROUGH"
-	Shortcut r
+	PicName "M_ROUGH"
+	Key r
 
 skill normal
 	SpawnFilter "Normal"
-	MenuLump "M_HURT"
-	Shortcut v
+	PicName "M_HURT"
+	Key v
 
 skill hard
 	SpawnFilter "Normal"
-	MenuLump "M_ULTRA"
-	Shortcut e
+	PicName "M_ULTRA"
+	Key e
 
 skill nightmare
 	AmmoFactor 2
@@ -29,9 +29,9 @@ skill nightmare
 	DisableCheats
 	RespawnTime 16
 	SpawnFilter "Hard"
-	MenuLump "M_NMARE"
+	PicName "M_NMARE"
 	MustConfirm
-	Shortcut b
+	Key b
 
 defaultmap
 forcenoskystretch