mirror of
https://github.com/Fledge68/WiiFlow_Lite.git
synced 2024-12-24 19:01:56 +01:00
-got a bit sleep
-force video mode works now for sure ;) -fixed booting gamecube retail games video mode -re-added parent control for gamecube games
This commit is contained in:
parent
0afba30306
commit
f6c23a67ee
@ -701,7 +701,7 @@ private:
|
||||
void _launchGame(dir_discHdr *hdr, bool dvd);
|
||||
void _launchChannel(dir_discHdr *hdr);
|
||||
void _launchHomebrew(const char *filepath, safe_vector<std::string> arguments);
|
||||
void _launchGC(const char *id);
|
||||
void _launchGC(const char *id, bool DML);
|
||||
void _setAA(int aa);
|
||||
void _loadCFCfg(SThemeData &theme);
|
||||
void _loadCFLayout(int version, bool forceAA = false, bool otherScrnFmt = false);
|
||||
|
@ -462,12 +462,9 @@ void CMenu::_game(bool launch)
|
||||
if (m_gameLblUser[i] != -1u)
|
||||
m_btnMgr.show(m_gameLblUser[i]);
|
||||
|
||||
if (m_current_view != COVERFLOW_DML && !m_locked)
|
||||
{
|
||||
b = m_gcfg1.getBool("ADULTONLY", id, false);
|
||||
m_btnMgr.show(b ? m_gameBtnAdultOn : m_gameBtnAdultOff);
|
||||
m_btnMgr.hide(b ? m_gameBtnAdultOff : m_gameBtnAdultOn);
|
||||
}
|
||||
m_btnMgr.show(m_gameBtnSettings);
|
||||
|
||||
if (m_current_view == COVERFLOW_USB && !m_locked)
|
||||
@ -535,7 +532,7 @@ void CMenu::_launch(dir_discHdr *hdr)
|
||||
_launchChannel(hdr);
|
||||
break;
|
||||
case COVERFLOW_DML:
|
||||
_launchGC((const char*)hdr->hdr.id);
|
||||
_launchGC((const char*)hdr->hdr.id,true);
|
||||
break;
|
||||
case COVERFLOW_USB:
|
||||
default:
|
||||
@ -546,22 +543,29 @@ void CMenu::_launch(dir_discHdr *hdr)
|
||||
|
||||
extern "C" {extern void USBStorage_Deinit(void);}
|
||||
|
||||
void CMenu::_launchGC(const char *id)
|
||||
void CMenu::_launchGC(const char *id, bool DML)
|
||||
{
|
||||
u8 DMLvideoMode = min((u32)m_gcfg2.getInt(id, "dml_video_mode", 0), ARRAY_SIZE(CMenu::_DMLvideoModes) - 1u);
|
||||
if (!DML)
|
||||
DMLvideoMode = 0;
|
||||
Close_Inputs();
|
||||
USBStorage_Deinit();
|
||||
Nand::Instance()->Disable_Emu();
|
||||
|
||||
if (DML)
|
||||
{
|
||||
char filepath[ISFS_MAXPATH] ATTRIBUTE_ALIGN(32);
|
||||
FILE *f;
|
||||
sprintf(filepath, "%s:/games/boot.bin", DeviceName[SD]);
|
||||
f = fopen(filepath, "wb");
|
||||
fwrite(id, 1, 6, f);
|
||||
fclose(f);
|
||||
}
|
||||
|
||||
cleanup();
|
||||
|
||||
if (DML)
|
||||
{
|
||||
memcpy((char *)0x80000000, id, 6);
|
||||
|
||||
// Tell DML to boot the game from sd card
|
||||
@ -570,11 +574,12 @@ void CMenu::_launchGC(const char *id)
|
||||
ICInvalidateRange((void *)(0x80001800), 4);
|
||||
|
||||
*(volatile unsigned int *)0xCC003024 |= 7;
|
||||
}
|
||||
|
||||
setstreaming();
|
||||
|
||||
VIDEO_SetBlack(TRUE);
|
||||
if ((id[3] == 'P') || (DMLvideoMode == 1))
|
||||
if (((id[3] == 'P') && (DMLvideoMode == 0)) || (DMLvideoMode == 1))
|
||||
{
|
||||
SRAM_PAL();
|
||||
|
||||
@ -590,7 +595,7 @@ void CMenu::_launchGC(const char *id)
|
||||
VIDEO_ClearFrameBuffer(rmode, m_frameBuf, COLOR_BLACK);
|
||||
VIDEO_SetNextFramebuffer(m_frameBuf);
|
||||
}
|
||||
if ((id[3] != 'P') || (DMLvideoMode == 2))
|
||||
if (((id[3] != 'P') && (DMLvideoMode == 0)) || (DMLvideoMode == 2))
|
||||
{
|
||||
SRAM_NTSC();
|
||||
|
||||
@ -1065,17 +1070,15 @@ void CMenu::_launchGame(dir_discHdr *hdr, bool dvd)
|
||||
}
|
||||
}
|
||||
|
||||
cleanup();
|
||||
Close_Inputs();
|
||||
USBStorage_Deinit();
|
||||
if (gc)
|
||||
{
|
||||
WII_Initialize();
|
||||
if (WII_LaunchTitle(0x0000000100000100ULL)<0)
|
||||
Sys_LoadMenu();
|
||||
_launchGC(id.c_str(),false);
|
||||
}
|
||||
else
|
||||
{
|
||||
cleanup();
|
||||
Close_Inputs();
|
||||
USBStorage_Deinit();
|
||||
gprintf("Booting game\n");
|
||||
if (Disc_WiiBoot(videoMode, vipatch, countryPatch, patchVidMode) < 0)
|
||||
Sys_LoadMenu();
|
||||
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user