-disabled force video mode in dios mios (lite) for now, added

bool to set it back if wanted
This commit is contained in:
fix94.1 2012-07-11 13:10:52 +00:00
parent 6e1d34c879
commit ee49554a49
3 changed files with 15 additions and 12 deletions

View File

@ -21,7 +21,7 @@ u32 __SYS_UnlockSram(u32 write);
u32 __SYS_SyncSram(void);
DML_CFG *DMLCfg = NULL;
void GC_SetVideoMode(u8 videomode)
void GC_SetVideoMode(u8 videomode, bool force)
{
syssram *sram;
sram = __SYS_LockSram();
@ -47,32 +47,32 @@ void GC_SetVideoMode(u8 videomode)
if(videomode == 1)
{
if(DMLCfg != NULL)
if(DMLCfg != NULL && force)
DMLCfg->VideoMode |= DML_VID_FORCE_PAL50;
rmode = &TVPal528IntDf;
}
else if(videomode == 2)
{
if(DMLCfg != NULL)
if(DMLCfg != NULL && force)
DMLCfg->VideoMode |= DML_VID_FORCE_NTSC;
rmode = &TVNtsc480IntDf;
}
else if(videomode == 3)
{
if(DMLCfg != NULL)
if(DMLCfg != NULL && force)
DMLCfg->VideoMode |= DML_VID_FORCE_PAL60;
rmode = &TVEurgb60Hz480IntDf;
memflag = 5;
}
else if(videomode == 4 ||videomode == 6)
{
if(DMLCfg != NULL)
if(DMLCfg != NULL && force)
DMLCfg->VideoMode |= DML_VID_FORCE_PROG;
rmode = &TVNtsc480Prog;
}
else if(videomode == 5 || videomode == 7)
{
if(DMLCfg != NULL)
if(DMLCfg != NULL && force)
DMLCfg->VideoMode |= DML_VID_FORCE_PROG;
rmode = &TVNtsc480Prog;
memflag = 5;
@ -159,7 +159,7 @@ int GC_GameIsInstalled(char *discid, const char* partition, const char* dmlgamed
return 0;
}
void DML_New_SetOptions(const char *GamePath, char *CheatPath, char *NewCheatPath, bool cheats, bool debugger, u8 NMM, u8 nodisc, u8 DMLvideoMode)
void DML_New_SetOptions(const char *GamePath, char *CheatPath, char *NewCheatPath, bool cheats, bool debugger, u8 NMM, u8 nodisc, u8 DMLvideoMode, bool force)
{
gprintf("Wiiflow DML: Launch game '%s' through memory (new method)\n", GamePath);
@ -170,7 +170,10 @@ void DML_New_SetOptions(const char *GamePath, char *CheatPath, char *NewCheatPat
DMLCfg->Magicbytes = 0xD1050CF6;
DMLCfg->CfgVersion = 0x00000001;
DMLCfg->VideoMode |= DML_VID_FORCE;
if(force)
DMLCfg->VideoMode |= DML_VID_FORCE;
else
DMLCfg->VideoMode |= DML_VID_DML_AUTO;
DMLCfg->Config |= DML_CFG_ACTIVITY_LED; //Sorry but I like it lol, option will may follow
DMLCfg->Config |= DML_CFG_PADHOOK; //Makes life easier, l+z+b+digital down...

View File

@ -45,11 +45,11 @@ enum dmlvideomode
DML_VID_PROG_PATCH = (1<<4),
};
void GC_SetVideoMode(u8 videomode);
void GC_SetVideoMode(u8 videomode, bool force);
void GC_SetLanguage(u8 lang);
int GC_GameIsInstalled(char *discid, const char* partition, const char* dmlgamedir);
void DML_New_SetOptions(const char *GamePath, char *CheatPath, char *NewCheatPath, bool cheats, bool debugger, u8 NMM, u8 nodisc, u8 DMLvideoMode);
void DML_New_SetOptions(const char *GamePath, char *CheatPath, char *NewCheatPath, bool cheats, bool debugger, u8 NMM, u8 nodisc, u8 DMLvideoMode, bool force);
void DML_Old_SetOptions(char *GamePath, char *CheatPath, char *NewCheatPath, bool cheats);
void DML_New_SetBootDiscOption();
void DML_New_WriteOptions();

View File

@ -826,7 +826,7 @@ void CMenu::_launchGC(dir_discHdr *hdr, bool DML)
else
newPath = &path[path.find_first_of(":/")+1];
if(m_new_dml)
DML_New_SetOptions(newPath.c_str(), CheatPath, NewCheatPath, cheats, DML_debug, NMM, nodisc, DMLvideoMode);
DML_New_SetOptions(newPath.c_str(), CheatPath, NewCheatPath, cheats, DML_debug, NMM, nodisc, DMLvideoMode, false);
else
DML_Old_SetOptions((char*)path.c_str(), CheatPath, NewCheatPath, cheats);
@ -849,7 +849,7 @@ void CMenu::_launchGC(dir_discHdr *hdr, bool DML)
USBStorage_Deinit();
SDHC_Init();
GC_SetVideoMode(DMLvideoMode);
GC_SetVideoMode(DMLvideoMode, false);
GC_SetLanguage(GClanguage);
DML_New_WriteOptions();