diff --git a/source/menu.cpp b/source/menu.cpp index ce3bfbc..7d2363b 100644 --- a/source/menu.cpp +++ b/source/menu.cpp @@ -3847,11 +3847,11 @@ static int MenuSettingsVideo() case 2: sprintf (options.value[5], "Progressive (480p)"); break; case 3: - sprintf (options.value[5], "Progressive (576p)"); break; - case 4: sprintf (options.value[5], "PAL (50Hz)"); break; - case 5: + case 4: sprintf (options.value[5], "PAL (60Hz)"); break; + case 5: + sprintf (options.value[5], "Progressive (576p)"); break; } sprintf (options.value[6], "%s", GCSettings.HiResolution == 1 ? "On" : "Off"); sprintf (options.value[7], "%s", GCSettings.SpriteLimit == 1 ? "On" : "Off"); diff --git a/source/snes9xgx.h b/source/snes9xgx.h index e8d6b13..7dfbd6a 100644 --- a/source/snes9xgx.h +++ b/source/snes9xgx.h @@ -133,7 +133,7 @@ struct SGCSettings{ float zoomHor; // horizontal zoom amount float zoomVert; // vertical zoom amount - int videomode; // 0 - automatic, 1 - NTSC (480i), 2 - Progressive (480p), 3 - Progressive (576p), 4 - PAL (50Hz), 5 - PAL (60Hz) + int videomode; // 0 - Automatic, 1 - NTSC (480i), 2 - Progressive (480p), 3 - PAL (50Hz), 4 - PAL (60Hz), 5 - Progressive (576p) int render; // 0 - original, 1 - filtered, 2 - unfiltered int FilterMethod; // convert to RenderFilter int Controller; diff --git a/source/video.cpp b/source/video.cpp index 7edecd9..e3a2d92 100644 --- a/source/video.cpp +++ b/source/video.cpp @@ -399,15 +399,15 @@ static GXRModeObj * FindVideoMode() case 2: // Progressive (480p) mode = &TVNtsc480Prog; break; - case 3: // Progressive (576p) - mode = &TVPal576ProgScale; - break; - case 4: // PAL (50Hz) + case 3: // PAL (50Hz) mode = &TVPal576IntDfScale; break; - case 5: // PAL (60Hz) + case 4: // PAL (60Hz) mode = &TVEurgb60Hz480IntDf; break; + case 5: // Progressive (576p) + mode = &TVPal576ProgScale; + break; default: mode = VIDEO_GetPreferredMode(NULL); @@ -417,8 +417,6 @@ static GXRModeObj * FindVideoMode() * on the Wii, the user can do this themselves on their Wii Settings */ if(VIDEO_HaveComponentCable()) mode = &TVNtsc480Prog; - else - mode = &TVPal576ProgScale; #endif break;