UILetterboxing: allow letterbox to get disabled sooner

Author: emoose

OutRun2006Tweaks.ini

@@ -2,12 +2,12 @@
 
 [Performance]
 # Set to 0 to disable this framelimiter if you want to use an external one instead.
-#  (with FramerateUnlockExperimental enabled, this can be increased above 60FPS without affecting game speed)
+#  (with FramerateUnlockExperimental enabled this can be increased above 60FPS without affecting game speed)
 FramerateLimit = 60
 
 # 0 = efficient mode
 # 1 = accurate mode
-# The default 0 should work fine for most people, but if you have issues it might be worth trying the accurate mode.
+# Default 0 should work fine for most people, but if you have issues it might be worth trying the accurate mode.
 FramerateLimitMode = 0
 
 # Unlimits framerate during load screens to help reduce load times.
@@ -22,59 +22,58 @@ FramerateUnlockExperimental = true
 # Set to 0 to disable VSync, 1 for normal v-sync, or 2 for half-refresh-rate vsync
 VSync = 1
 
-[Vibration]
-# Enable/disable the xbox vibration code, or customise it
-#  0 = disable
-#  1 = enable xbox vibration code
-#  2 = ^ with L/R motors swapped
-#  3 = ^ with L/R motors merged together
-VibrationMode = 1
+[Graphics]
+# Adjusts the UI scaling applied by the game
+#  0 = game default, stretches to screen ratio
+#  1 = 4:3 UI centered to middle of screen
+#  2 = mostly fixed scaling without stretching, based on Outrun Online Arcade
+#
+# NOTE: these modes will enable 4:3 letterboxing during menus, but in-game won't have any letterboxing
+# Outrun Online Arcade scaling required many manual code fixes, if you notice anything broken please let me know!
+UIScalingMode = 0
 
-# XInput device to send vibration to, default should work fine in most cases, but if you don't notice any vibration you can try increasing this here
-VibrationControllerId = 0
+# 1 - 16, 0 to leave it at games default.
+AnisotropicFiltering = 16
 
-# VibrationStrength range is 0 to 10
-VibrationStrength = 10
+# Resolution used for car reflections, games default is 128x128, 2048x2048 seems a reasonable improvement
+ReflectionResolution = 2048
 
-# Enable/disable Xbox Series impulse trigger vibration, or customise it
-# (VibrationMode must be enabled above for this to work)
-#  0 = disable
-#  1 = enable impulse triggers
-#  2 = ^ with L/R motors swapped (recommended for impulse triggers)
-#  3 = ^ with L/R motors merged together
-ImpulseVibrationMode = 2
+# Allows game to enable 4x transparency supersampling, heavily reducing aliasing on things like barriers or cloth around the track edge.
+#  For best results use this with "DX/ANTIALIASING = 2" inside outrun2006.ini
+TransparencySupersampling = true
 
-# Multipliers of the trigger vibration, the normal controller motor vibration is multiplied by these to set trigger value
-ImpulseVibrationLeftMultiplier = 0.20
-ImpulseVibrationRightMultiplier = 0.20
+# Fixes certain stage objects disappearing before they reach edge of screen, when playing at non-4:3 aspect ratio.
+ScreenEdgeCullFix = true
 
-[Window]
-# Forces windowed mode to become borderless. (requires "DX/WINDOWED = 1" inside outrun2006.ini)
-WindowedBorderless = true
+# Disables LODs on vehicles, reducing the ugly pop-in they have.
+DisableVehicleLODs = true
 
-# Only applied if WindowedBorderless is set to true.
-WindowPositionX = 0
-WindowPositionY = 0
+# Disables culling of certain stage objects, so most distant objects won't obviously pop in to view.
+DisableStageCulling = true
 
-# Hides mouse cursor while game window is active.
-WindowedHideMouseCursor = true
+# Fixes Z-Buffer precision issues, greatly reducing z-fighting and distant object drawing issues (eg. signs/buildings will have much less pop-in)
+FixZBufferPrecision = true
 
-# Disables DPI scaling on game window, can help fix issues when screen DPI is set above 100%
-DisableDPIScaling = true
+# Allows textures to be replaced if a matching texture exists inside textures\load\ folder
+#  Textures must be named as [hash]_[width]x[height].dds, where hash/width/height comes from the original texture to be replaced
+#  They can also be kept in seperate subfolders for the texture package the original texture belongs to, or just kept inside the base texture\load\ folder
+#  You can find the correct filename/texture package name by enabling TextureDump below
+SceneTextureReplacement = true
+UITextureReplacement = true
 
-# If the outrun2006.ini file doesn't exist, changes games default 640x480 resolution to primary display resolution instead
-#  Otherwise the resolution from outrun2006.ini (or Config.exe tool) will be used
-AutoDetectResolution = true
+# Dumps out textures into textures\dump\ folder as the game loads them in (if a replacement texture isn't loaded)
+#  Textures will be dumped into separate subfolders for the texture package each texture belongs to
+SceneTextureDump = false
+UITextureDump = false
 
 [Audio]
 # Allows game to load in uncompressed WAV files instead of compressed OGG
 #  WAV files must have the same filename as the original OGG, eg. "Sound\14_Rush_a_Difficulty_1989.wav"
-#  Only WAV & OGG are supported by the game, other formats such as FLAC must be converted to WAV for game to use
 AllowUncompressedBGM = true
 
 # Adds support for loading FLAC audio files
-#  This requires AllowUncompressedBGM to be enabled to work
 #  FLAC files must have the same filename as the original OGG, eg. "Sound\14_Rush_a_Difficulty_1989.flac"
+#  (requires AllowUncompressedBGM to be enabled to work)
 AllowFLAC = true
 
 [CDSwitcher]
@@ -107,46 +106,49 @@ SwitcherTitlePositionY = 450
 TrackNext = Back
 TrackPrevious = RS+Back
 
-[Graphics]
-# Adjusts the UI scaling applied by the game
-#  0 = game default, stretches to screen ratio
-#  1 = 4:3 UI centered to middle of screen
-#  2 = WIP based on Outrun Online Arcade
-UIScalingMode = 0
+[Vibration]
+# Enable/disable the xbox vibration code, or customise it
+#  0 = disable
+#  1 = enable xbox vibration code
+#  2 = ^ with L/R motors swapped
+#  3 = ^ with L/R motors merged together
+VibrationMode = 1
 
-# 1 - 16, 0 to leave it at games default.
-AnisotropicFiltering = 16
+# XInput device to send vibration to, default should work fine in most cases, but if you don't notice any vibration you can try increasing this here
+VibrationControllerId = 0
 
-# Resolution used for car reflections, games default is 128x128, 2048x2048 seems a reasonable improvement
-ReflectionResolution = 2048
+# VibrationStrength range is 0 to 10
+VibrationStrength = 10
 
-# Allows game to enable 4x transparency supersampling, heavily reducing aliasing on things like barriers or cloth around the track edge.
-#  For best results use this with "DX/ANTIALIASING = 2" inside outrun2006.ini
-TransparencySupersampling = true
+# Enable/disable Xbox Series impulse trigger vibration, or customise it
+# (VibrationMode must be enabled above for this to work)
+#  0 = disable
+#  1 = enable impulse triggers
+#  2 = ^ with L/R motors swapped (recommended for impulse triggers)
+#  3 = ^ with L/R motors merged together
+ImpulseVibrationMode = 2
 
-# Fixes certain stage objects disappearing before they reach edge of screen, when playing at non-4:3 aspect ratio.
-ScreenEdgeCullFix = true
+# Multipliers of the trigger vibration, the normal controller motor vibration is multiplied by these to set trigger value
+ImpulseVibrationLeftMultiplier = 0.20
+ImpulseVibrationRightMultiplier = 0.20
 
-# Disables LODs on vehicles, reducing the ugly pop-in they have.
-DisableVehicleLODs = true
+[Window]
+# Forces windowed mode to become borderless. (requires "DX/WINDOWED = 1" inside outrun2006.ini)
+WindowedBorderless = true
 
-# Disables culling of certain stage objects, so most distant objects won't obviously pop in to view.
-DisableStageCulling = true
+# Only applied if WindowedBorderless is set to true.
+WindowPositionX = 0
+WindowPositionY = 0
 
-# Fixes Z-Buffer precision issues, greatly reducing z-fighting and distant object drawing issues (eg. signs/buildings will have much less pop-in)
-FixZBufferPrecision = true
+# Hides mouse cursor while game window is active.
+WindowedHideMouseCursor = true
 
-# Allows textures to be replaced if a matching texture exists inside textures\load\ folder
-#  Textures must be named as [hash]_[width]x[height].dds, where hash/width/height comes from the original texture to be replaced
-#  They can also be kept in seperate subfolders for the texture package the original texture belongs to (or just kept inside the base texture\load\ folder)
-#  You can find the correct filename/texture package name by enabling TextureDump below
-SceneTextureReplacement = true
-UITextureReplacement = true
+# Disables DPI scaling on game window, can help fix issues when screen DPI is set above 100%
+DisableDPIScaling = true
 
-# Dumps out textures into textures\dump\ folder as the game loads them in, if a replacement texture isn't loaded
-#  Textures will be dumped into separate subfolders for the texture package each texture belongs to
-SceneTextureDump = false
-UITextureDump = false
+# If the outrun2006.ini file doesn't exist, changes games default 640x480 resolution to primary display resolution instead
+#  Otherwise the resolution from outrun2006.ini (or Config.exe tool) will be used
+AutoDetectResolution = true
 
 [Misc]
 # Skips the beginning intro logos, saving a couple seconds from startup time. (game will still show a white screen for 5-10 seconds while data loads in)

src/hooks_graphics.cpp

@@ -1190,7 +1190,11 @@ class UILetterboxing : public Hook
 			VertexBuf->Unlock();
 		}
 
-		if (*Game::current_mode == GameState::STATE_GAME || *Game::current_mode == GameState::STATE_SMPAUSEMENU)
+		bool isInGame = *Game::current_mode == GameState::STATE_GAME ||
+			*Game::current_mode == GameState::STATE_SMPAUSEMENU ||
+			(*Game::current_mode == GameState::STATE_START && *Game::game_start_progress_code == 65);
+
+		if (isInGame)
 			return; // disable letterboxing while in-game
 
 		// Backup existing cullmode and set to none, otherwise we won't get drawn