Implement ScreenCaution, fix CDTitle

Themes/_fallback/Scripts/02 Branches.lua

@@ -59,6 +59,13 @@ Branch = {
 			return "ScreenTitleJoin"
 		end
 	end,
+	AfterTitleMenu = function()
+		if PREFSMAN:GetPreference("ShowCaution") then
+			return "ScreenCaution"
+		else
+			return Branch.StartGame()
+		end
+	end,
 	StartGame = function()
 		-- Check to see if there are 0 songs installed. Also make sure to check
 		-- that the additional song count is also 0, because there is

Themes/_fallback/metrics.ini

@@ -1837,7 +1837,7 @@ UpdateOnMessage=""
 NumChoicesOnPage1=100
 DefaultChoice="GameStart"
 ChoiceNames="GameStart,Options,Edit,Jukebox,GameSelect,Exit"
-ChoiceGameStart="applydefaultoptions;text,Game Start;screen,"..Branch.StartGame()
+ChoiceGameStart="applydefaultoptions;text,Game Start;screen,"..Branch.AfterTitleMenu()
 #ChoiceQuickPlay="applydefaultoptions;text,Quick Play;"
 ChoiceOptions="screen,ScreenOptionsService;text,Options"
 ChoiceEdit="text,Edit/Share;screen,"..Branch.OptionsEdit()
@@ -1892,6 +1892,14 @@ LogoY=SCREEN_CENTER_Y-80
 LogoOnCommand=bob;effectperiod,4;effectmagnitude,0,8,0;zoom,0;bounceend,0.35;zoom,1
 LogoOffCommand=
 
+[ScreenCaution]
+Fallback="ScreenSplash"
+PrepareScreen=""
+NextScreen=Branch.StartGame()
+PrevScreen=Branch.TitleMenu()
+TimerSeconds=3
+AllowStartToSkip=true
+
 [ScreenProfileLoad]
 Class="ScreenProfileLoad"
 Fallback="ScreenWithMenuElementsBlank"
@@ -2999,7 +3007,7 @@ Line19="conf,NumBackgrounds"
 Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsService"
 PrevScreen="ScreenOptionsService"
-LineNames="1,3,4,6,7,9,10,11,12,14"
+LineNames="1,3,4,6,7,8,9,10,11,12,14"
 Line1="conf,Center1Player"
 Line3="conf,DancePointsForOni"
 Line4="conf,MenuTimer"