mirror of
https://github.com/wiidev/usbloadergx.git
synced 2024-11-26 13:14:18 +01:00
*fixed two nasty bugs I added in R1082 preventing every game patch from working (block ios reload with d2x is the only one that still will not work yet. a change for this is upcomming)
*added back rev number to credits *allow boot of loader when IOS222 or 245-250 is available on the system *fixed reload of game list after game rename
This commit is contained in:
parent
6ab1fb327c
commit
71d1790f7f
@ -2,8 +2,8 @@
|
|||||||
<app version="1">
|
<app version="1">
|
||||||
<name> USB Loader GX</name>
|
<name> USB Loader GX</name>
|
||||||
<coder>USB Loader GX Team</coder>
|
<coder>USB Loader GX Team</coder>
|
||||||
<version>2.1 r1083</version>
|
<version>2.1 r1084</version>
|
||||||
<release_date>201105301947</release_date>
|
<release_date>201105302033</release_date>
|
||||||
<no_ios_reload/>
|
<no_ios_reload/>
|
||||||
<short_description>Loads games from USB-devices</short_description>
|
<short_description>Loads games from USB-devices</short_description>
|
||||||
<long_description>USB Loader GX is a libwiigui based USB iso loader with a wii-like GUI. You can install games to your HDDs and boot them with shorter loading times.
|
<long_description>USB Loader GX is a libwiigui based USB iso loader with a wii-like GUI. You can install games to your HDDs and boot them with shorter loading times.
|
||||||
|
@ -122,7 +122,7 @@ bool StartUpProcess::Execute()
|
|||||||
|
|
||||||
if(IosLoader::LoadAppCios() < 0)
|
if(IosLoader::LoadAppCios() < 0)
|
||||||
{
|
{
|
||||||
SetTextf("Failed loading any cIOS. USB Loader GX requires at least cIOS 222, 249 or 250. Exiting...\n");
|
SetTextf("Failed loading any cIOS. USB Loader GX requires at least cIOS 222 or 245-250. Exiting...\n");
|
||||||
sleep(5);
|
sleep(5);
|
||||||
Sys_BackToLoader();
|
Sys_BackToLoader();
|
||||||
}
|
}
|
||||||
|
@ -1292,6 +1292,7 @@ int GameBrowseMenu::OpenClickedGame()
|
|||||||
{
|
{
|
||||||
SetState(STATE_DISABLED);
|
SetState(STATE_DISABLED);
|
||||||
GameWindow * GamePrompt = new GameWindow(gameSelected);
|
GameWindow * GamePrompt = new GameWindow(gameSelected);
|
||||||
|
GamePrompt->SetGameBrowseMenu(this);
|
||||||
mainWindow->Append(GamePrompt);
|
mainWindow->Append(GamePrompt);
|
||||||
choice = GamePrompt->Show();
|
choice = GamePrompt->Show();
|
||||||
gameSelected = GamePrompt->GetSelectedGame();
|
gameSelected = GamePrompt->GetSelectedGame();
|
||||||
|
@ -14,9 +14,9 @@ class GameBrowseMenu : public GuiWindow
|
|||||||
GameBrowseMenu();
|
GameBrowseMenu();
|
||||||
~GameBrowseMenu();
|
~GameBrowseMenu();
|
||||||
static int Execute();
|
static int Execute();
|
||||||
|
void ReloadBrowser();
|
||||||
protected:
|
protected:
|
||||||
int MainLoop();
|
int MainLoop();
|
||||||
void ReloadBrowser();
|
|
||||||
int OpenClickedGame();
|
int OpenClickedGame();
|
||||||
int GetSelectedGame();
|
int GetSelectedGame();
|
||||||
int GetClickedGame();
|
int GetClickedGame();
|
||||||
|
@ -51,15 +51,15 @@ void ClearDOLList()
|
|||||||
|
|
||||||
void gamepatches(u8 videoSelected, u8 languageChoice, u8 patchcountrystring, u8 vipatch, u8 cheat, u8 fix002, u8 blockiosreloadselect, u8 gameIOS, u64 returnTo)
|
void gamepatches(u8 videoSelected, u8 languageChoice, u8 patchcountrystring, u8 vipatch, u8 cheat, u8 fix002, u8 blockiosreloadselect, u8 gameIOS, u64 returnTo)
|
||||||
{
|
{
|
||||||
|
es_fd = IOS_Open(es_fs, 0);
|
||||||
int i;
|
int i;
|
||||||
int es_fd = IOS_Open(es_fs, 0);
|
|
||||||
|
|
||||||
int returnToPatched = PatchNewReturnTo(returnTo);
|
int returnToPatched = PatchNewReturnTo(returnTo);
|
||||||
|
|
||||||
for(i = 0; i < dolCount; ++i)
|
for(i = 0; i < dolCount; ++i)
|
||||||
{
|
{
|
||||||
u8 *dst = dolList[dolCount].dst;
|
u8 *dst = dolList[i].dst;
|
||||||
int len = dolList[dolCount].len;
|
int len = dolList[i].len;
|
||||||
|
|
||||||
VideoModePatcher(dst, len, videoSelected);
|
VideoModePatcher(dst, len, videoSelected);
|
||||||
|
|
||||||
|
@ -530,6 +530,8 @@ int GameWindow::MainLoop()
|
|||||||
((GuiWindow *) parentElement)->SetState(STATE_DISABLED);
|
((GuiWindow *) parentElement)->SetState(STATE_DISABLED);
|
||||||
((GuiWindow *) parentElement)->Append(this);
|
((GuiWindow *) parentElement)->Append(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(browserMenu) browserMenu->ReloadBrowser();
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (btnRight->GetState() == STATE_CLICKED) //next game
|
else if (btnRight->GetState() == STATE_CLICKED) //next game
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
#include "libwiigui/gui.h"
|
#include "libwiigui/gui.h"
|
||||||
#include "libwiigui/gui_diskcover.h"
|
#include "libwiigui/gui_diskcover.h"
|
||||||
|
#include "menu/GameBrowseMenu.hpp"
|
||||||
|
|
||||||
#define FAVORITE_STARS 5
|
#define FAVORITE_STARS 5
|
||||||
|
|
||||||
@ -13,6 +14,7 @@ class GameWindow : public GuiWindow
|
|||||||
~GameWindow();
|
~GameWindow();
|
||||||
int Show();
|
int Show();
|
||||||
int GetSelectedGame() { return gameSelected; };
|
int GetSelectedGame() { return gameSelected; };
|
||||||
|
void SetGameBrowseMenu(GameBrowseMenu *m) { browserMenu = m; };
|
||||||
protected:
|
protected:
|
||||||
int MainLoop();
|
int MainLoop();
|
||||||
void LoadGameSound(const u8 * id);
|
void LoadGameSound(const u8 * id);
|
||||||
@ -23,6 +25,7 @@ class GameWindow : public GuiWindow
|
|||||||
bool reducedVol;
|
bool reducedVol;
|
||||||
int returnVal;
|
int returnVal;
|
||||||
int gameSelected;
|
int gameSelected;
|
||||||
|
GameBrowseMenu *browserMenu;
|
||||||
|
|
||||||
GuiTrigger * trigA;
|
GuiTrigger * trigA;
|
||||||
GuiTrigger * trigB;
|
GuiTrigger * trigB;
|
||||||
|
@ -242,9 +242,9 @@ void WindowCredits()
|
|||||||
|
|
||||||
char SvnRev[30];
|
char SvnRev[30];
|
||||||
#ifdef FULLCHANNEL
|
#ifdef FULLCHANNEL
|
||||||
snprintf(SvnRev, sizeof(SvnRev), "v2.1c IOS%u (Rev %u)", IOS_GetVersion(), IOS_GetRevision());
|
snprintf(SvnRev, sizeof(SvnRev), "Rev%sc IOS%u (Rev %u)", GetRev(), IOS_GetVersion(), IOS_GetRevision());
|
||||||
#else
|
#else
|
||||||
snprintf(SvnRev, sizeof(SvnRev), "v2.1 IOS%u (Rev %u)", IOS_GetVersion(), IOS_GetRevision());
|
snprintf(SvnRev, sizeof(SvnRev), "Rev%s IOS%u (Rev %u)", GetRev(), IOS_GetVersion(), IOS_GetRevision());
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
txt[i] = new GuiText(SvnRev, 16, ( GXColor ) {255, 255, 255, 255});
|
txt[i] = new GuiText(SvnRev, 16, ( GXColor ) {255, 255, 255, 255});
|
||||||
|
@ -52,7 +52,7 @@ s32 IosLoader::LoadAppCios()
|
|||||||
if((int) activeCios == Settings.cios)
|
if((int) activeCios == Settings.cios)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
u32 ciosLoadPriority[] = { Settings.cios, 222, 249, 250 }; // Ascending.
|
u32 ciosLoadPriority[] = { Settings.cios, 222, 249, 250, 245, 246, 247, 248 }; // Ascending.
|
||||||
|
|
||||||
|
|
||||||
for (u32 i = 0; i < (sizeof(ciosLoadPriority)/sizeof(ciosLoadPriority[0])); ++i)
|
for (u32 i = 0; i < (sizeof(ciosLoadPriority)/sizeof(ciosLoadPriority[0])); ++i)
|
||||||
|
Loading…
Reference in New Issue
Block a user