From 6e9e75c02ccc76883eb5ed5b29f0537ff615d652 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 3 Oct 2021 15:54:08 +0200
Subject: [PATCH] - disallow changing the line spacing for option menus.

With the VGA font this makes no sense anymore.
---
 src/common/menu/menudef.cpp |  3 ++-
 wadsrc/static/menudef.txt   | 12 ------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/common/menu/menudef.cpp b/src/common/menu/menudef.cpp
index 280349781..ef3397df0 100644
--- a/src/common/menu/menudef.cpp
+++ b/src/common/menu/menudef.cpp
@@ -910,7 +910,7 @@ static void ParseOptionSettings(FScanner &sc)
 		else if (sc.Compare("Linespacing"))
 		{
 			sc.MustGetNumber();
-			OptionSettings.mLinespacing = sc.Number;
+			// ignored
 		}
 		else if (sc.Compare("LabelOffset"))
 		{
@@ -1402,6 +1402,7 @@ void M_ParseMenuDefs()
 	DefaultOptionMenuSettings = Create<DOptionMenuDescriptor>();
 	DefaultListMenuSettings->Reset();
 	DefaultOptionMenuSettings->Reset();
+	OptionSettings.mLinespacing = 17;
 
 	int IWADMenu = fileSystem.CheckNumForName("MENUDEF", ns_global, fileSystem.GetIwadNum());
 
diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt
index 8e7a316db..a5878a3c6 100644
--- a/wadsrc/static/menudef.txt
+++ b/wadsrc/static/menudef.txt
@@ -344,18 +344,6 @@ OptionValue AutoOffOn
 	1, "$OPTVAL_ON"
 }
 
-OptionMenuSettings
-{
-	// These can be overridden if a different menu fonts requires it.
-	Linespacing 17
-	/*
-	IfGame(Heretic, Hexen)
-	{
-		Linespacing 9
-	}
-	*/
-}
-
 DefaultOptionMenu
 {
 	Position -15