The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2024-11-24 04:09:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

-changed version number to Beta 4.0.6

Browse Source 
-fixed shutdown in vwii mode
-fixed return to in vwii mode
This commit is contained in:
fix94.1 2012-12-15 13:06:33 +00:00
parent a8ba1f8e49
commit 09638f273a
4 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/defines.h
View File

@ -1,5 +1,5 @@
#define APP_NAME "WiiFlow" #define APP_NAME "WiiFlow"
#define APP_VERSION "Beta 4.0.5" #define APP_VERSION "Beta 4.0.6"
#define APPDATA_DIR "wiiflow" #define APPDATA_DIR "wiiflow"
#define APPDATA_DIR2 "apps/wiiflow" #define APPDATA_DIR2 "apps/wiiflow"

16
source/loader/sys.c
View File

@ -60,15 +60,6 @@ bool Sys_Exiting(void)
return reset || shutdown; return reset || shutdown;
} }
void Sys_Shutdown(void)
{
/* via hollywood registers first */
*HW_GPIO_OUT |= (1<<1);
usleep(50000);
/* If it failed just do the libogc way */
SYS_ResetSystem(SYS_SHUTDOWN, 0, 0);
}
int Sys_GetExitTo(void) int Sys_GetExitTo(void)
{ {
return ExitOption; return ExitOption;
@ -103,6 +94,11 @@ void Sys_Exit(void)
/* Shutdown Inputs */ /* Shutdown Inputs */
Close_Inputs(); Close_Inputs();
/* Just shutdown console*/
if(ExitOption == BUTTON_CALLBACK)
SYS_ResetSystem(SYS_POWEROFF_STANDBY, 0, 0);
/* We wanna to boot sth */
WII_Initialize(); WII_Initialize();
if(ExitOption == EXIT_TO_WFNK2O) if(ExitOption == EXIT_TO_WFNK2O)
Launch_nk(0x1000144574641LL, NeekPath, 0); Launch_nk(0x1000144574641LL, NeekPath, 0);
@ -117,8 +113,6 @@ void Sys_Exit(void)
WII_LaunchTitle(HBC_JODI); WII_LaunchTitle(HBC_JODI);
WII_LaunchTitle(HBC_HAXX); WII_LaunchTitle(HBC_HAXX);
} }
else if(ExitOption == BUTTON_CALLBACK)
Sys_Shutdown();
/* else Return to Menu */ /* else Return to Menu */
SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0); SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);
exit(1); exit(1);

1
source/loader/sys.h
View File

@ -31,7 +31,6 @@ enum
/* Prototypes */ /* Prototypes */
void Sys_Init(void); void Sys_Init(void);
void Sys_Shutdown(void);
bool Sys_DolphinMode(void); bool Sys_DolphinMode(void);
bool Sys_Exiting(void); bool Sys_Exiting(void);
void Sys_Exit(void); void Sys_Exit(void);

4
source/menu/menu_game.cpp
View File

@ -1219,7 +1219,7 @@ void CMenu::_launchGame(dir_discHdr *hdr, bool dvd)
int language = min((u32)m_gcfg2.getInt(id, "language", 0), ARRAY_SIZE(CMenu::_languages) - 1u); int language = min((u32)m_gcfg2.getInt(id, "language", 0), ARRAY_SIZE(CMenu::_languages) - 1u);
language = (language == 0) ? min((u32)m_cfg.getInt("GENERAL", "game_language", 0), ARRAY_SIZE(CMenu::_languages) - 1) : language; language = (language == 0) ? min((u32)m_cfg.getInt("GENERAL", "game_language", 0), ARRAY_SIZE(CMenu::_languages) - 1) : language;
const char *rtrn = m_gcfg2.getBool(id, "returnto", true) ? m_cfg.getString("GENERAL", "returnto").c_str() : NULL; const char *rtrn = m_cfg.getString("GENERAL", "returnto", "").c_str();
int aspectRatio = min((u32)m_gcfg2.getInt(id, "aspect_ratio", 0), ARRAY_SIZE(CMenu::_AspectRatio) - 1u)-1; int aspectRatio = min((u32)m_gcfg2.getInt(id, "aspect_ratio", 0), ARRAY_SIZE(CMenu::_AspectRatio) - 1u)-1;
string emuPath; string emuPath;
@ -1315,7 +1315,7 @@ void CMenu::_launchGame(dir_discHdr *hdr, bool dvd)
if(!debuggerselect && cheatFile == NULL) if(!debuggerselect && cheatFile == NULL)
hooktype = 0; hooktype = 0;
if(rtrn != NULL && strlen(rtrn) == 4) if(strlen(rtrn) == 4)
returnTo = rtrn[0] << 24 | rtrn[1] << 16 | rtrn[2] << 8 | rtrn[3]; returnTo = rtrn[0] << 24 | rtrn[1] << 16 | rtrn[2] << 8 | rtrn[3];
int userIOS = m_gcfg2.getInt(id, "ios", 0); int userIOS = m_gcfg2.getInt(id, "ios", 0);
int gameIOS = dvd && !neek2o() ? userIOS : GetRequestedGameIOS(hdr); int gameIOS = dvd && !neek2o() ? userIOS : GetRequestedGameIOS(hdr);