Remove access to some dead preferences

THIS FIXES THE GAME START BUG (i hope)

Author: poco0317

Themes/Til Death/Scripts/02 Branches.lua

@@ -65,11 +65,7 @@ Branch = {
 		end
 	end,
 	AfterTitleMenu = function()
-		if PREFSMAN:GetPreference("ShowCaution") then
-			return "ScreenCaution"
-		else
-			return Branch.StartGame()
-		end
+		return Branch.StartGame()
 	end,
 	StartGame = function()
 		multiplayer = false

Themes/Til Death/metrics.ini

@@ -619,7 +619,7 @@ LineInputOptions="gamecommand;screen,ScreenOptionsInputSub;name,InputOptions"
 Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsService"
 PrevScreen="ScreenOptionsService"
-LineNames="SongBGEnabled,EvalBGType,SongBGMouseEnabled,Particles,RateSort,HelpMenu,NPSWindow,MeasureLines,Visualizer"
+LineNames="SongBGEnabled,RateSort,HelpMenu,NPSWindow,MeasureLines,Visualizer"
 #LineDefaultScore="lua,DefaultScoreType()"
 LineTipType="lua,TipType()"
 LineSongBGEnabled="lua,SongBGEnabled()"

Themes/_fallback/Scripts/02 Branches.lua

@@ -63,11 +63,7 @@ Branch = {
 		end
 	end,
 	AfterTitleMenu = function()
-		if PREFSMAN:GetPreference("ShowCaution") then
-			return "ScreenCaution"
-		else
-			return Branch.StartGame()
-		end
+		return Branch.StartGame()
 	end,
 	StartGame = function()
 		if SONGMAN:GetNumSongs() == 0 and SONGMAN:GetNumAdditionalSongs() == 0 then

Themes/_fallback/metrics.ini

@@ -2376,7 +2376,7 @@ LineOsuLifts="conf,LiftsOnOsuHolds"
 Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsDisplaySub"
 PrevScreen="ScreenOptionsDisplaySub"
-LineNames="1,2,3,4,NSA,NG,14,15,SB,17,19"
+LineNames="1,2,3,4,NSA,NG,14,15,SB,19"
 Line1="conf,Language"
 Line2="conf,Announcer"
 Line3="conf,Theme"
@@ -2395,10 +2395,11 @@ LineNG="conf,NoGlow"
 Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsDisplaySub"
 PrevScreen="ScreenOptionsDisplaySub"
-LineNames="1,6,8,9,10,11,12,14"
+LineNames="1,6,11,12"
+# many options were removed from this line because they dont function
+# we can make them function properly if necessary later.
 Line1="conf,Center1Player"
 Line6="conf,MusicWheelUsesSections"
-Line8="conf,ShowCaution"
 Line9="conf,ShowDanger"
 Line10="conf,ShowInstructions"
 Line11="conf,ShowLyrics"

src/Etterna/Screen/Options/ScreenOptionsMasterPrefs.cpp

@@ -747,7 +747,6 @@ InitializeConfOptions()
 	ADD(ConfOption("EnablePitchRates", MovePref<bool>, "Off", "On"));
 	ADD(ConfOption("LiftsOnOsuHolds", MovePref<bool>, "Off", "On"));
 	ADD(ConfOption("ShowInstructions", MovePref<bool>, "Skip", "Show"));
-	ADD(ConfOption("ShowCaution", MovePref<bool>, "Skip", "Show"));
 	ADD(ConfOption("MusicWheelUsesSections",
 				   MovePref<MusicWheelUsesSections>,
 				   "Never",

src/Etterna/Singletons/PrefsManager.cpp

@@ -173,7 +173,6 @@ PrefsManager::PrefsManager()
   m_bDelayedBack("DelayedBack", false)
   , m_AllowHoldForOptions("AllowHoldForOptions", true)
   , m_bShowInstructions("ShowInstructions", false)
-  , m_bShowCaution("ShowCaution", false)
   , m_bFullTapExplosions("FullTapExplosions", true)
   , m_bNoGlow("NoGlow", false)
   , m_bShowNativeLanguage("ShowNativeLanguage", true)

src/Etterna/Singletons/PrefsManager.h

@@ -177,7 +177,6 @@ class PrefsManager
 	Preference<bool> m_bDelayedBack;
 	Preference<bool> m_AllowHoldForOptions;
 	Preference<bool> m_bShowInstructions; // how to play a mode
-	Preference<bool> m_bShowCaution;
 	Preference<bool> m_bShowNativeLanguage;
 	Preference<bool> m_bFullTapExplosions;
 	Preference<bool> m_bNoGlow;