From 3bd53dafbe6bc3fb685f3e709c8d1b5b8c64b9a9 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Wed, 9 Jan 2008 09:01:30 +0000
Subject: [PATCH] - Fixed: 'Painchance' in DECORATE failed when reading custom
 damage type names. - Added Karate Chris's patch for menu opening console
 commands.

SVN r684 (trunk)
---
 docs/rh-log.txt                      |  4 ++++
 src/m_options.cpp                    | 14 ++++++++++++++
 src/thingdef/thingdef_properties.cpp |  1 +
 3 files changed, 19 insertions(+)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 80a37824e..1a93685dd 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,7 @@
+January 9, 2008 (Changes by Graf Zahl)
+- Fixed: 'Painchance' in DECORATE failed when reading custom damage type names.
+- Added Karate Chris's patch for menu opening console commands.
+
 January 8, 2008
 - Fixed: When starting a teamplay netgame, players who did not specify a team
   were not informed about which team they ended up joining.
diff --git a/src/m_options.cpp b/src/m_options.cpp
index 066c05bdd..9e1183a87 100644
--- a/src/m_options.cpp
+++ b/src/m_options.cpp
@@ -2567,6 +2567,13 @@ static void StartScoreboardMenu (void)
 	M_SwitchMenu (&ScoreboardMenu);
 }
 
+CCMD (menu_messages)
+{
+	M_StartControlPanel (true);
+	OptionsActive = true;
+	StartMessagesMenu ();
+}
+
 CCMD (menu_automap)
 {
 	M_StartControlPanel (true);
@@ -2574,6 +2581,13 @@ CCMD (menu_automap)
 	StartAutomapMenu ();
 }
 
+CCMD (menu_scoreboard)
+{
+	M_StartControlPanel (true);
+	OptionsActive = true;
+	StartScoreboardMenu ();
+}
+
 static void StartMapColorsMenu (void)
 {
 	M_SwitchMenu (&MapColorsMenu);
diff --git a/src/thingdef/thingdef_properties.cpp b/src/thingdef/thingdef_properties.cpp
index e4808d94c..5a09bf27c 100644
--- a/src/thingdef/thingdef_properties.cpp
+++ b/src/thingdef/thingdef_properties.cpp
@@ -868,6 +868,7 @@ static void ActorPainChance (AActor *defaults, Baggage &bag)
 	if (!SC_CheckNumber())
 	{
 		FName painType;
+		SC_MustGetString();
 		if (SC_Compare("Normal")) painType = NAME_None;
 		else painType=sc_String;
 		SC_MustGetToken(',');