From d5c3991c2e4a894a48164b761c67d3db5e817186 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sat, 30 Nov 2019 10:03:20 +0100
Subject: [PATCH] -  fixed compile errors in menu code.

---
 source/common/menu/loadsavemenu.cpp  | 2 +-
 source/common/menu/menu.h            | 4 +++-
 source/common/menu/menudef.cpp       | 8 ++++----
 source/common/menu/optionmenuitems.h | 3 ++-
 source/duke3d/src/d_menu.cpp         | 2 --
 source/rr/src/d_menu.cpp             | 1 -
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/source/common/menu/loadsavemenu.cpp b/source/common/menu/loadsavemenu.cpp
index f68ab1d25..f3d21487f 100644
--- a/source/common/menu/loadsavemenu.cpp
+++ b/source/common/menu/loadsavemenu.cpp
@@ -417,7 +417,7 @@ protected:
 						FString EndString;
 						EndString.Format("%s" TEXTCOLOR_WHITE "%s" TEXTCOLOR_NORMAL "?\n\n%s",
 							GStrings("MNU_DELETESG"), manager.GetSavegame(Selected)->SaveTitle.GetChars(), GStrings("PRESSYN"));
-						M_StartMessage(EndString, 0);
+						M_StartMessage(EndString, 0, -1);
 					}
 					return true;
 					}
diff --git a/source/common/menu/menu.h b/source/common/menu/menu.h
index 2fbdf3511..ee2a40458 100644
--- a/source/common/menu/menu.h
+++ b/source/common/menu/menu.h
@@ -98,10 +98,12 @@ enum EMenuSounds : int
 	AdvanceSound,
 	BackSound,
 	CloseSound,
-	PageSound
+	PageSound,
 	ChangeSound
 };
 
+EXTERN_CVAR(Bool, menu_sounds)
+
 struct event_t;
 class FTexture;
 class FFont;
diff --git a/source/common/menu/menudef.cpp b/source/common/menu/menudef.cpp
index 2faaa6935..63f66dc93 100644
--- a/source/common/menu/menudef.cpp
+++ b/source/common/menu/menudef.cpp
@@ -879,11 +879,11 @@ static void ParseOptionMenuBody(FScanner &sc, FOptionMenuDescriptor *desc)
 		{
 			sc.MustGetString();
 			FString label = sc.String;
-			bool cr = false;
+			EColorRange cr = OptionSettings.mFontColorHeader;
 			if (sc.CheckString(","))
 			{
 				sc.MustGetNumber();
-				cr = !!sc.Number;
+				cr = sc.Number? OptionSettings.mFontColorHeader : OptionSettings.mFontColor;	// fixme!
 			}
 			FOptionMenuItem *it = new FOptionMenuItemStaticText(label, cr);
 			desc->mItems.Push(it);
@@ -898,11 +898,11 @@ static void ParseOptionMenuBody(FScanner &sc, FOptionMenuDescriptor *desc)
 			sc.MustGetStringName(",");
 			sc.MustGetString();
 			FName action = sc.String;
-			bool cr = false;
+			EColorRange cr = OptionSettings.mFontColorHeader;
 			if (sc.CheckString(","))
 			{
 				sc.MustGetNumber();
-				cr = !!sc.Number;
+				cr = sc.Number ? OptionSettings.mFontColorHeader : OptionSettings.mFontColor;	// fixme!
 			}
 			FOptionMenuItem *it = new FOptionMenuItemStaticTextSwitchable(label, label2, action, cr);
 			desc->mItems.Push(it);
diff --git a/source/common/menu/optionmenuitems.h b/source/common/menu/optionmenuitems.h
index c97e53236..fdabd2e33 100644
--- a/source/common/menu/optionmenuitems.h
+++ b/source/common/menu/optionmenuitems.h
@@ -34,6 +34,7 @@
 #include "v_text.h"
 #include "v_draw.h"
 #include "gstrings.h"
+#include "v_font.h"
 
 
 void M_DrawConText (int color, int x, int y, const char *str);
@@ -901,7 +902,7 @@ public:
 			M_MenuSound(AdvanceSound);
 			mEditName = GetCVarString();
 			mEntering = true;
-			DMenu* input = new DTextEnterMenu ( DMenu::CurrentMenu, mEditName, sizeof mEditName, 2, fromcontroller );
+			DMenu* input = new DTextEnterMenu(DMenu::CurrentMenu, NewSmallFont, mEditName, 256, fromcontroller );
 			M_ActivateMenu( input );
 			return true;
 		}
diff --git a/source/duke3d/src/d_menu.cpp b/source/duke3d/src/d_menu.cpp
index bafc2ffef..33b3b0c3c 100644
--- a/source/duke3d/src/d_menu.cpp
+++ b/source/duke3d/src/d_menu.cpp
@@ -507,8 +507,6 @@ void GameInterface::CustomMenuSelection(int menu, int item)
 	VM_OnEventWithReturn(EVENT_NEWGAMECUSTOM, -1, myconnectindex, menu);
 }
 
-EXTERN_CVAR(Bool, menu_sounds)
-
 void GameInterface::StartGame(FGameStartup& gs)
 {
 	int32_t skillsound = PISTOL_BODYHIT;
diff --git a/source/rr/src/d_menu.cpp b/source/rr/src/d_menu.cpp
index 3913dc466..6800fefe1 100644
--- a/source/rr/src/d_menu.cpp
+++ b/source/rr/src/d_menu.cpp
@@ -426,7 +426,6 @@ bool GameInterface::CanSave()
 	return true;
 }
 
-EXTERN_CVAR(Bool, menu_sounds)
 void GameInterface::StartGame(FGameStartup& gs)
 {
 	int32_t skillsound = PISTOL_BODYHIT;