Fix GameCube video (#1062)

This commit is contained in:
bladeoner 2023-03-26 18:48:21 +02:00 committed by GitHub
parent 8f421f8dca
commit f72afdce4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 11 deletions

View File

@ -3847,11 +3847,11 @@ static int MenuSettingsVideo()
case 2: case 2:
sprintf (options.value[5], "Progressive (480p)"); break; sprintf (options.value[5], "Progressive (480p)"); break;
case 3: case 3:
sprintf (options.value[5], "Progressive (576p)"); break;
case 4:
sprintf (options.value[5], "PAL (50Hz)"); break; sprintf (options.value[5], "PAL (50Hz)"); break;
case 5: case 4:
sprintf (options.value[5], "PAL (60Hz)"); break; 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[6], "%s", GCSettings.HiResolution == 1 ? "On" : "Off");
sprintf (options.value[7], "%s", GCSettings.SpriteLimit == 1 ? "On" : "Off"); sprintf (options.value[7], "%s", GCSettings.SpriteLimit == 1 ? "On" : "Off");

View File

@ -133,7 +133,7 @@ struct SGCSettings{
float zoomHor; // horizontal zoom amount float zoomHor; // horizontal zoom amount
float zoomVert; // vertical 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 render; // 0 - original, 1 - filtered, 2 - unfiltered
int FilterMethod; // convert to RenderFilter int FilterMethod; // convert to RenderFilter
int Controller; int Controller;

View File

@ -399,15 +399,15 @@ static GXRModeObj * FindVideoMode()
case 2: // Progressive (480p) case 2: // Progressive (480p)
mode = &TVNtsc480Prog; mode = &TVNtsc480Prog;
break; break;
case 3: // Progressive (576p) case 3: // PAL (50Hz)
mode = &TVPal576ProgScale;
break;
case 4: // PAL (50Hz)
mode = &TVPal576IntDfScale; mode = &TVPal576IntDfScale;
break; break;
case 5: // PAL (60Hz) case 4: // PAL (60Hz)
mode = &TVEurgb60Hz480IntDf; mode = &TVEurgb60Hz480IntDf;
break; break;
case 5: // Progressive (576p)
mode = &TVPal576ProgScale;
break;
default: default:
mode = VIDEO_GetPreferredMode(NULL); mode = VIDEO_GetPreferredMode(NULL);
@ -417,8 +417,6 @@ static GXRModeObj * FindVideoMode()
* on the Wii, the user can do this themselves on their Wii Settings */ * on the Wii, the user can do this themselves on their Wii Settings */
if(VIDEO_HaveComponentCable()) if(VIDEO_HaveComponentCable())
mode = &TVNtsc480Prog; mode = &TVNtsc480Prog;
else
mode = &TVPal576ProgScale;
#endif #endif
break; break;