UI/GameDB: fixed issues with MAD integration in UI and GameDB

GameDB: fixed compile error
This commit is contained in:
sideprojectslab 2022-11-12 19:13:52 +00:00 committed by refractionpcsx2
parent 64f6bf52b0
commit 50861dc5c1
3 changed files with 4 additions and 4 deletions

View File

@ -192,7 +192,7 @@
"deinterlace": { "deinterlace": {
"type": "integer", "type": "integer",
"minimum": 0, "minimum": 0,
"maximum": 7 "maximum": 9
}, },
"cpuSpriteRenderBW": { "cpuSpriteRenderBW": {
"type": "integer", "type": "integer",

View File

@ -2790,9 +2790,9 @@ void FullscreenUI::DrawGraphicsSettingsPage()
"11", //GSRendererType::Null "11", //GSRendererType::Null
}; };
static constexpr const char* s_vsync_values[] = {"Off", "On", "Adaptive"}; static constexpr const char* s_vsync_values[] = {"Off", "On", "Adaptive"};
static constexpr const char* s_deinterlacing_options[] = {"None", "Weave (Top Field First, Sawtooth)", static constexpr const char* s_deinterlacing_options[] = {"Automatic (Default)", "None", "Weave (Top Field First, Sawtooth)",
"Weave (Bottom Field First, Sawtooth)", "Bob (Top Field First)", "Bob (Bottom Field First)", "Blend (Top Field First, Half FPS)", "Weave (Bottom Field First, Sawtooth)", "Bob (Top Field First)", "Bob (Bottom Field First)", "Blend (Top Field First, Half FPS)",
"Blend (Bottom Field First, Half FPS)", "Automatic (Default)"}; "Blend (Bottom Field First, Half FPS)", "Adaptive (Top Field First", "Adaptive (Bottom Field First)"};
static const char* s_resolution_options[] = { static const char* s_resolution_options[] = {
"Native (PS2)", "Native (PS2)",
"1.25x Native", "1.25x Native",

View File

@ -632,7 +632,7 @@ u32 GameDatabaseSchema::GameEntry::applyGSHardwareFixes(Pcsx2Config::GSOptions&
case GSHWFixId::Deinterlace: case GSHWFixId::Deinterlace:
{ {
if (value >= 0 && value <= static_cast<int>(GSInterlaceMode::Automatic)) if (value >= static_cast<int>(GSInterlaceMode::Automatic) && value < static_cast<int>(GSInterlaceMode::Count))
{ {
if (config.InterlaceMode == GSInterlaceMode::Automatic) if (config.InterlaceMode == GSInterlaceMode::Automatic)
config.InterlaceMode = static_cast<GSInterlaceMode>(value); config.InterlaceMode = static_cast<GSInterlaceMode>(value);