diff --git a/UnleashedRecomp/cfg/config.h b/UnleashedRecomp/cfg/config.h index 3ab7969b..2db482cf 100644 --- a/UnleashedRecomp/cfg/config.h +++ b/UnleashedRecomp/cfg/config.h @@ -56,10 +56,10 @@ public: CONFIG_DEFINE_LOCALISED("Video", int32_t, FPS, 60); CONFIG_DEFINE_LOCALISED("Video", float, Brightness, 0.5f); CONFIG_DEFINE_ENUM_LOCALISED("Video", EAntiAliasing, AntiAliasing, EAntiAliasing::MSAA4x); + CONFIG_DEFINE_LOCALISED("Video", bool, AlphaToCoverage, true); CONFIG_DEFINE("Video", size_t, AnisotropicFiltering, 16); CONFIG_DEFINE_ENUM_LOCALISED("Video", EShadowResolution, ShadowResolution, EShadowResolution::x4096); CONFIG_DEFINE_ENUM_LOCALISED("Video", EGITextureFiltering, GITextureFiltering, EGITextureFiltering::Bicubic); - CONFIG_DEFINE_LOCALISED("Video", bool, AlphaToCoverage, true); CONFIG_DEFINE_LOCALISED("Video", bool, MotionBlur, true); CONFIG_DEFINE_LOCALISED("Video", bool, Xbox360ColourCorrection, false); CONFIG_DEFINE_ENUM_LOCALISED("Video", EMovieScaleMode, MovieScaleMode, EMovieScaleMode::Fit); diff --git a/UnleashedRecomp/cfg/config_locale.h b/UnleashedRecomp/cfg/config_locale.h index 8d7f22ea..7feca13a 100644 --- a/UnleashedRecomp/cfg/config_locale.h +++ b/UnleashedRecomp/cfg/config_locale.h @@ -137,16 +137,6 @@ CONFIG_DEFINE_DESCRIPTION_LOCALE(LogoSkip) { ELanguage::English, "Show the logos during the game's boot sequence." } }; -CONFIG_DEFINE_LOCALE(BackgroundInput) -{ - { ELanguage::English, "Allow Background Input" } -}; - -CONFIG_DEFINE_DESCRIPTION_LOCALE(BackgroundInput) -{ - { ELanguage::English, "Set whether to accept controller input whilst the game window is unfocused." } -}; - CONFIG_DEFINE_LOCALE(CameraXInvert) { { ELanguage::English, "Invert Camera X" } @@ -187,6 +177,16 @@ CONFIG_DEFINE_DESCRIPTION_LOCALE(UnleashCancel) { ELanguage::English, "Set whether Unleash can be cancelled by pressing the input again." } }; +CONFIG_DEFINE_LOCALE(BackgroundInput) +{ + { ELanguage::English, "Allow Background Input" } +}; + +CONFIG_DEFINE_DESCRIPTION_LOCALE(BackgroundInput) +{ + { ELanguage::English, "Set whether to accept controller input whilst the game window is unfocused." } +}; + CONFIG_DEFINE_LOCALE(MusicVolume) { { ELanguage::English, "Music Volume" } @@ -338,6 +338,16 @@ CONFIG_DEFINE_ENUM_LOCALE(EAntiAliasing) } }; +CONFIG_DEFINE_LOCALE(AlphaToCoverage) +{ + { ELanguage::English, "Transparency Anti-Aliasing" } +}; + +CONFIG_DEFINE_DESCRIPTION_LOCALE(AlphaToCoverage) +{ + { ELanguage::English, "Set whether to apply anti-aliasing to alpha transparent textures." } +}; + CONFIG_DEFINE_LOCALE(ShadowResolution) { { ELanguage::English, "Shadow Resolution" } @@ -379,16 +389,6 @@ CONFIG_DEFINE_ENUM_LOCALE(EGITextureFiltering) } }; -CONFIG_DEFINE_LOCALE(AlphaToCoverage) -{ - { ELanguage::English, "Transparency Anti-Aliasing" } -}; - -CONFIG_DEFINE_DESCRIPTION_LOCALE(AlphaToCoverage) -{ - { ELanguage::English, "Set whether to apply anti-aliasing to alpha transparent textures." } -}; - CONFIG_DEFINE_LOCALE(MotionBlur) { { ELanguage::English, "Motion Blur" } diff --git a/UnleashedRecomp/ui/options_menu.cpp b/UnleashedRecomp/ui/options_menu.cpp index 93c0b9a8..bc250cbf 100644 --- a/UnleashedRecomp/ui/options_menu.cpp +++ b/UnleashedRecomp/ui/options_menu.cpp @@ -681,9 +681,9 @@ static void DrawConfigOptions() DrawConfigOption(rowCount++, yOffset, &Config::FPS); DrawConfigOption(rowCount++, yOffset, &Config::Brightness); DrawConfigOption(rowCount++, yOffset, &Config::AntiAliasing); + DrawConfigOption(rowCount++, yOffset, &Config::AlphaToCoverage); DrawConfigOption(rowCount++, yOffset, &Config::ShadowResolution); DrawConfigOption(rowCount++, yOffset, &Config::GITextureFiltering); - DrawConfigOption(rowCount++, yOffset, &Config::AlphaToCoverage); DrawConfigOption(rowCount++, yOffset, &Config::MotionBlur); DrawConfigOption(rowCount++, yOffset, &Config::Xbox360ColourCorrection); DrawConfigOption(rowCount++, yOffset, &Config::MovieScaleMode);