mirror of
https://github.com/ekeeke/Genesis-Plus-GX.git
synced 2025-01-28 02:45:27 +01:00
[gamecube] proper fix for previous issue, disclaimer is also now displayed with configured video mode
[gamecube/wii] disabled disclaimer screen if auto-played ROM has been loaded
This commit is contained in:
parent
2dd6e86c1c
commit
659c46f083
@ -220,5 +220,17 @@ void config_default(void)
|
|||||||
|
|
||||||
/* restore inputs */
|
/* restore inputs */
|
||||||
input_init();
|
input_init();
|
||||||
}
|
|
||||||
|
|
||||||
|
#ifdef HW_RVL
|
||||||
|
/* support for progressive mode (480p) if component cable has been detected */
|
||||||
|
if (VIDEO_HaveComponentCable())
|
||||||
|
{
|
||||||
|
/* switch into configured video mode */
|
||||||
|
vmode = config.v_prog ? &TVNtsc480Prog : &TVNtsc480IntDf;
|
||||||
|
VIDEO_Configure (vmode);
|
||||||
|
VIDEO_Flush();
|
||||||
|
VIDEO_WaitVSync();
|
||||||
|
VIDEO_WaitVSync();
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
@ -128,6 +128,12 @@ void legal ()
|
|||||||
/* switch user progressive mode configuration */
|
/* switch user progressive mode configuration */
|
||||||
config.v_prog ^= 1;
|
config.v_prog ^= 1;
|
||||||
|
|
||||||
|
if (VIDEO_HaveComponentCable())
|
||||||
|
{
|
||||||
|
/* switch video mode only if component cable has been detected */
|
||||||
|
vmode = config.v_prog ? &TVNtsc480Prog : &TVNtsc480IntDf;
|
||||||
|
}
|
||||||
|
|
||||||
/* play sound to inform user then enter main menu */
|
/* play sound to inform user then enter main menu */
|
||||||
ASND_Pause(0);
|
ASND_Pause(0);
|
||||||
int voice = ASND_GetFirstUnusedVoice();
|
int voice = ASND_GetFirstUnusedVoice();
|
||||||
|
@ -1384,13 +1384,6 @@ void gx_video_Stop(void)
|
|||||||
#ifdef HW_RVL
|
#ifdef HW_RVL
|
||||||
VIDEO_SetTrapFilter(1);
|
VIDEO_SetTrapFilter(1);
|
||||||
VIDEO_SetGamma(VI_GM_1_0);
|
VIDEO_SetGamma(VI_GM_1_0);
|
||||||
#else
|
|
||||||
/* support for progressive mode (480p) if component cable has been detected */
|
|
||||||
if (VIDEO_HaveComponentCable())
|
|
||||||
{
|
|
||||||
/* switch into configured video mode */
|
|
||||||
vmode = config.v_prog ? &TVNtsc480Prog : &TVNtsc480IntDf;
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* adjust TV width */
|
/* adjust TV width */
|
||||||
|
@ -544,7 +544,6 @@ int main (int argc, char *argv[])
|
|||||||
gx_audio_Init();
|
gx_audio_Init();
|
||||||
|
|
||||||
/* initialize genesis plus core */
|
/* initialize genesis plus core */
|
||||||
legal();
|
|
||||||
config_default();
|
config_default();
|
||||||
history_default();
|
history_default();
|
||||||
init_machine();
|
init_machine();
|
||||||
@ -567,6 +566,12 @@ int main (int argc, char *argv[])
|
|||||||
SILENT = 0;
|
SILENT = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* show disclaimer */
|
||||||
|
if (ConfigRequested)
|
||||||
|
{
|
||||||
|
legal();
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef HW_RVL
|
#ifdef HW_RVL
|
||||||
/* power button callback */
|
/* power button callback */
|
||||||
SYS_SetPowerCallback(PowerOff_cb);
|
SYS_SetPowerCallback(PowerOff_cb);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user