The-Homebrew-Cloud/usbloadergx
2
0
Fork 0
mirror of https://github.com/wiidev/usbloadergx.git synced 2024-12-23 10:21:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
hungyip 2009-06-04 03:47:01 +00:00
parent 3887824fde
commit 8d1c7ba450
2 changed files with 108 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/cfg.c
View File

@ -270,8 +270,8 @@ void CFG_Default(int widescreen) // -1 = non forced Mode
THEME.home_y = 367;
THEME.setting_x = 60;//-210
THEME.setting_y = 367;
THEME.showHDD = -1; //default, non-force mode
THEME.showGameCnt = -1; //default, non-force mode
THEME.showHDD = 1; //default
THEME.showGameCnt = 1; //default
THEME.showToolTip = 1; //1 means use settings, 0 means force turn off
THEME.install_x = 16;//-280
THEME.install_y = 355;

47
source/menu.cpp
View File

@ -2975,7 +2975,6 @@ static int MenuInstall()
static int MenuDiscList()
{
datagB = 0;
int menu = MENU_NONE, dataef = 0;
char imgPath[100];
@ -3301,11 +3300,11 @@ static int MenuDiscList()
HaltGui();
GuiWindow w(screenwidth, screenheight);
if(THEME.showHDD == -1 || THEME.showHDD == 1) //force show hdd info
if(THEME.showHDD == 1)
{
w.Append(&usedSpaceTxt);
}
if(THEME.showGameCnt == -1 || THEME.showGameCnt == 1) //force show game cnt info
if(THEME.showGameCnt == 1)
{
w.Append(&gamecntTxt);
}
@ -5730,23 +5729,23 @@ static int MenuCheck()
int menu = MENU_NONE;
int i = 0;
int choice;
s32 ret, ret2;
s32 ret;
OptionList options;
options.length = i;
partitionEntry partitions[MAX_PARTITIONS];
VIDEO_WaitVSync ();
ret2 = WBFS_Init(WBFS_DEVICE_USB);
if (ret2 < 0)
ret = WBFS_Init(WBFS_DEVICE_USB);
if (ret < 0)
{
ret2 = WindowPrompt(LANGUAGE.NoUSBDevicefound,
ret = WindowPrompt(LANGUAGE.NoUSBDevicefound,
LANGUAGE.Doyouwanttoretryfor30secs,
"cIOS249", "cIOS222",
LANGUAGE.BacktoWiiMenu, 0);
if(ret2 == 1) {
"cIOS249", "cIOS222", LANGUAGE.BacktoWiiMenu, 0);
if(ret == 1) {
Settings.cios = ios249;
} else if(ret2 == 2) {
}
else if(ret == 2) {
if(Settings.cios != ios222)
{
//shutdown WiiMote before IOS Reload
@ -5773,7 +5772,8 @@ static int MenuCheck()
else
Settings.cios = ios222;
}
} else {
}
else {
Sys_LoadMenu();
}
@ -5786,7 +5786,7 @@ static int MenuCheck()
SDCard_deInit();
USBDevice_deInit();
ret2 = DiscWait(LANGUAGE.NoUSBDevice, LANGUAGE.WaitingforUSBDevice, 0, 0, 1);
ret = DiscWait(LANGUAGE.NoUSBDevice, LANGUAGE.WaitingforUSBDevice, 0, 0, 1);
//reinitialize WiiMote for Prompt
PAD_Init();
Wpad_Init();
@ -5796,19 +5796,20 @@ static int MenuCheck()
SDCard_Init();
USBDevice_Init();
}
if (ret2 < 0) {
if (ret < 0) {
WindowPrompt (LANGUAGE.Error,LANGUAGE.USBDevicenotfound, LANGUAGE.ok, 0,0,0);
Sys_LoadMenu();
}
ret2 = Disc_Init();
if (ret2 < 0) {
ret = Disc_Init();
if (ret < 0) {
WindowPrompt (LANGUAGE.Error,LANGUAGE.CouldnotinitializeDIPmodule,LANGUAGE.ok, 0,0,0);
Sys_LoadMenu();
}
ret2 = WBFS_Open();
if (ret2 < 0) {
ret = WBFS_Open();
if (ret < 0) {
choice = WindowPrompt(LANGUAGE.NoWBFSpartitionfound,
LANGUAGE.Youneedtoformatapartition,
LANGUAGE.Format,
@ -5816,14 +5817,14 @@ static int MenuCheck()
if(choice == 0)
{
Sys_LoadMenu();
} else {
}
else {
/* Get partition entries */
u32 sector_size;
ret2 = Partition_GetEntries(partitions, &sector_size);
if (ret2 < 0) {
ret = Partition_GetEntries(partitions, &sector_size);
if (ret < 0) {
WindowPrompt (LANGUAGE.Nopartitionsfound,0, LANGUAGE.Restart, 0,0,0);
Sys_LoadMenu();
}
menu = MENU_FORMAT;
}
@ -5834,7 +5835,7 @@ static int MenuCheck()
if(reset == 1)
Sys_Reboot();
//Spieleliste laden
__Menu_GetEntries();
//__Menu_GetEntries();
if(menu == MENU_NONE)
menu = MENU_DISCLIST;