From fc0ae896b2e2ad8941eff82033e350623b9a033a Mon Sep 17 00:00:00 2001
From: Rachael Alexanderson <eruanna@drdteam.org>
Date: Tue, 10 Oct 2017 06:38:07 -0400
Subject: [PATCH] - remove vid_tft and vid_nowidescreen and associated menu
 option. Their functionality was supersceded and extended by vid_aspect==3
 (which has the same effect as setting both to true anyhow), and it was mostly
 just redundant.

---
 src/menu/videomenu.cpp    | 33 ---------------------------------
 src/v_video.cpp           | 21 ---------------------
 wadsrc/static/menudef.txt | 10 ----------
 3 files changed, 64 deletions(-)

diff --git a/src/menu/videomenu.cpp b/src/menu/videomenu.cpp
index 7d434843b..cea99cd42 100644
--- a/src/menu/videomenu.cpp
+++ b/src/menu/videomenu.cpp
@@ -74,7 +74,6 @@ EXTERN_CVAR (Int, vid_defwidth)
 EXTERN_CVAR (Int, vid_defheight)
 EXTERN_CVAR (Int, vid_defbits)
 EXTERN_CVAR (Bool, fullscreen)
-EXTERN_CVAR (Bool, vid_tft)		// Defined below
 
 int testingmode;		// Holds time to revert to old mode
 int OldWidth, OldHeight, OldBits;
@@ -87,43 +86,12 @@ CUSTOM_CVAR (Int, menu_screenratios, -1, CVAR_ARCHIVE)
 	{
 		self = -1;
 	}
-	else if (self == 4 && !vid_tft)
-	{
-		self = 0;
-	}
 	else
 	{
 		BuildModesList (screen->VideoWidth, screen->VideoHeight, DisplayBits);
 	}
 }
 
-CUSTOM_CVAR (Bool, vid_tft, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
-{
-	const int OptionMenuItemOptionBase_OP_VALUES = 0x11001;
-
-	DOptionMenuDescriptor *opt = GetVideoModeMenu();
-	if (opt != NULL)
-	{
-		DMenuItemBase *it = opt->GetItem("menu_screenratios");
-		if (it != NULL)
-		{
-			if (self)
-			{
-				it->SetString(OptionMenuItemOptionBase_OP_VALUES, "RatiosTFT");
-			}
-			else
-			{
-				it->SetString(OptionMenuItemOptionBase_OP_VALUES, "Ratios");
-			}
-		}
-	}
-	setsizeneeded = true;
-	if (StatusBar != NULL)
-	{
-		StatusBar->CallScreenSizeChanged();
-	}	
-}
-
 
 //=============================================================================
 //
@@ -278,7 +246,6 @@ void M_InitVideoModesMenu ()
 	size_t currval = 0;
 
 	M_RefreshModesList();
-	vid_tft.Callback();
 
 	for (unsigned int i = 1; i <= 32 && currval < countof(BitTranslate); i++)
 	{
diff --git a/src/v_video.cpp b/src/v_video.cpp
index b9dfeae08..926812534 100644
--- a/src/v_video.cpp
+++ b/src/v_video.cpp
@@ -1592,16 +1592,6 @@ void V_Shutdown()
 	V_ClearFonts();
 }
 
-EXTERN_CVAR (Bool, vid_tft)
-CUSTOM_CVAR (Bool, vid_nowidescreen, false, CVAR_GLOBALCONFIG|CVAR_ARCHIVE)
-{
-	setsizeneeded = true;
-	if (StatusBar != NULL)
-	{
-		StatusBar->CallScreenSizeChanged();
-	}
-}
-
 CUSTOM_CVAR (Int, vid_aspect, 0, CVAR_GLOBALCONFIG|CVAR_ARCHIVE)
 {
 	setsizeneeded = true;
@@ -1632,17 +1622,6 @@ int ActiveFakeRatio(int width, int height)
 	{
 		fakeratio = 0;
 	}
-	if (vid_nowidescreen)
-	{
-		if (!vid_tft)
-		{
-			fakeratio = 0;
-		}
-		else
-		{
-			fakeratio = (height * 5 / 4 == width) ? 4 : 0;
-		}
-	}
 	return fakeratio;
 }
 
diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt
index b3cd95a21..3d0621c3f 100644
--- a/wadsrc/static/menudef.txt
+++ b/wadsrc/static/menudef.txt
@@ -1842,15 +1842,6 @@ OptionValue ForceRatios
 	6.0, "21:9"
 }
 OptionValue Ratios
-{
-	0.0, "4:3"
-	1.0, "16:9"
-	2.0, "16:10"
-	3.0, "17:10"
-	6.0, "21:9"
-	 -1, "$OPTVAL_ALL"
-}
-OptionValue RatiosTFT
 {
 	0.0, "4:3"
 	4.0, "5:4"
@@ -1886,7 +1877,6 @@ OptionMenu VideoModeMenu protected
 	Option "$VIDMNU_ASPECTRATIO",		"menu_screenratios", "Ratios"
 	Option "$VIDMNU_FORCEASPECT",		"vid_aspect", "ForceRatios"
 	Option "$VIDMNU_CROPASPECT",		"vid_cropaspect", "CropAspect"
-	Option "$VIDMNU_5X4ASPECTRATIO",	"vid_tft", "YesNo"
 	Option "$VIDMNU_SCALEMODE",			"vid_scalemode", "ScaleModes"
 	Slider "$VIDMNU_SCALEFACTOR",		"vid_scalefactor", 0.25, 2.0, 0.25, 2
 	StaticText " "