The-Homebrew-Cloud/usbloadergx
2
0
Fork 0
mirror of https://github.com/wiidev/usbloadergx.git synced 2024-11-22 11:19:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

* fix WCharSortCallback() ( fixes game filter )

Browse Source
This commit is contained in:
giantpune 2010-09-19 01:16:04 +00:00
parent 9e79c9d99b
commit 344a81962f
6 changed files with 60 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HBC/META.XML
View File

@ -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>1.0 r951</version> <version>1.0 r952</version>
<release_date>201009182308</release_date> <release_date>201009182328</release_date>
<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.
The interactive GUI is completely controllable with WiiMote, Classic Controller or GC Controller. The interactive GUI is completely controllable with WiiMote, Classic Controller or GC Controller.

4
source/gecko.c
View File

@ -23,8 +23,8 @@ void gprintf( const char *str, ... )
va_end( ap ); va_end( ap );
usb_sendbuffer( 1, astr, strlen( astr ) ); //usb_sendbuffer( 1, astr, strlen( astr ) );
//usb_sendbuffer_safe( 1, astr, strlen(astr) ); usb_sendbuffer_safe( 1, astr, strlen(astr) );
} }
bool InitGecko() bool InitGecko()

12
source/main.cpp
View File

@ -72,9 +72,10 @@ u8 dbvideo = 0;
int main( int argc, char *argv[] ) int main( int argc, char *argv[] )
{ {
MEM2_init( 48 ); MEM2_init( 48 );
InitVideo();
setlocale( LC_ALL, "en.UTF-8" ); setlocale( LC_ALL, "en.UTF-8" );
geckoinit = InitGecko(); geckoinit = InitGecko();
InitVideo(); //TODO: some sort of magic is done in the CFG_Load() ( maybe stff with CONF_ ). if videoinit is after cfg load, my full screen is used.
//with videoinit before CFG load, i get black box around my picture
__exception_setreload( 20 ); __exception_setreload( 20 );
printf( "\tStarting up\n" ); printf( "\tStarting up\n" );
@ -126,17 +127,17 @@ int main( int argc, char *argv[] )
// Let's load the cIOS now // Let's load the cIOS now
if ( LoadAppCIOS() < 0 ) if ( LoadAppCIOS() < 0 )
{ {
printf( "\n\tERROR: No cIOS could be loaded. Exiting...." ); printf( "\tERROR: No cIOS could be loaded. Exiting....\n" );
sleep( 5 ); sleep( 5 );
Sys_BackToLoader(); Sys_BackToLoader();
} }
printf( "\n\tLoaded cIOS = %u (Rev %u)", IOS_GetVersion(), IOS_GetRevision() ); printf( "\tLoaded cIOS = %u (Rev %u)\n", IOS_GetVersion(), IOS_GetRevision() );
printf( "\n\tWaiting for USB: " ); printf( "\tWaiting for USB:\n" );
if ( MountWBFS() < 0 ) if ( MountWBFS() < 0 )
{ {
printf( "\nERROR: No WBFS drive mounted." ); printf( "ERROR: No WBFS drive mounted.\n" );
sleep( 5 ); sleep( 5 );
exit( 0 ); exit( 0 );
} }
@ -150,6 +151,7 @@ int main( int argc, char *argv[] )
} }
//! Init the rest of the System //! Init the rest of the System
Sys_Init(); Sys_Init();
SetupPads(); SetupPads();
InitAudio(); InitAudio();

83
source/menu/menu_disclist.cpp
View File

@ -49,12 +49,10 @@ static u32 startat = 0;
int MenuDiscList() int MenuDiscList()
{ {
gprintf( "\nMenuDiscList()" ); gprintf( "MenuDiscList()\n" );
//TakeScreenshot("SD:/screenshot1.png");
gameList.FilterList(); gameList.FilterList();
int offset = MIN( ( int )startat, gameList.size() - 1 ); int offset = MIN( ( int )startat, gameList.size() - 1 );
startat = offset; startat = offset;
//gprintf("\n\tstartat:%d offset:%d",startat,offset);
int datag = 0; int datag = 0;
int datagB = 0; int datagB = 0;
int dataed = -1; int dataed = -1;
@ -299,7 +297,6 @@ int MenuDiscList()
favoriteBtnTT.SetAlpha( THEME.tooltipAlpha ); favoriteBtnTT.SetAlpha( THEME.tooltipAlpha );
GuiImage favoriteBtnImg( &imgfavIcon ); GuiImage favoriteBtnImg( &imgfavIcon );
favoriteBtnImg.SetWidescreen( CFG.widescreen ); favoriteBtnImg.SetWidescreen( CFG.widescreen );
// GuiImage favoriteBtnImg_g(favoriteBtnImg);favoriteBtnImg_g.SetGrayscale();
GuiImage favoriteBtnImg_g( &imgfavIcon_gray ); GuiImage favoriteBtnImg_g( &imgfavIcon_gray );
if ( favoriteBtnImg_g.GetImage() == NULL ) { favoriteBtnImg_g = favoriteBtnImg; favoriteBtnImg_g.SetGrayscale();} if ( favoriteBtnImg_g.GetImage() == NULL ) { favoriteBtnImg_g = favoriteBtnImg; favoriteBtnImg_g.SetGrayscale();}
favoriteBtnImg_g.SetWidescreen( CFG.widescreen ); favoriteBtnImg_g.SetWidescreen( CFG.widescreen );
@ -312,7 +309,6 @@ int MenuDiscList()
searchBtnTT.SetAlpha( THEME.tooltipAlpha ); searchBtnTT.SetAlpha( THEME.tooltipAlpha );
GuiImage searchBtnImg( &imgsearchIcon ); GuiImage searchBtnImg( &imgsearchIcon );
searchBtnImg.SetWidescreen( CFG.widescreen ); searchBtnImg.SetWidescreen( CFG.widescreen );
// GuiImage searchBtnImg_g(searchBtnImg); searchBtnImg_g.SetGrayscale();
GuiImage searchBtnImg_g( &imgsearchIcon_gray ); GuiImage searchBtnImg_g( &imgsearchIcon_gray );
if ( searchBtnImg_g.GetImage() == NULL ) { searchBtnImg_g = searchBtnImg; searchBtnImg_g.SetGrayscale();} if ( searchBtnImg_g.GetImage() == NULL ) { searchBtnImg_g = searchBtnImg; searchBtnImg_g.SetGrayscale();}
searchBtnImg_g.SetWidescreen( CFG.widescreen ); searchBtnImg_g.SetWidescreen( CFG.widescreen );
@ -325,7 +321,6 @@ int MenuDiscList()
abcBtnTT.SetAlpha( THEME.tooltipAlpha ); abcBtnTT.SetAlpha( THEME.tooltipAlpha );
GuiImage abcBtnImg( Settings.fave ? &imgrankIcon : &imgabcIcon ); GuiImage abcBtnImg( Settings.fave ? &imgrankIcon : &imgabcIcon );
abcBtnImg.SetWidescreen( CFG.widescreen ); abcBtnImg.SetWidescreen( CFG.widescreen );
// GuiImage abcBtnImg_g(abcBtnImg); abcBtnImg_g.SetGrayscale();
GuiImage abcBtnImg_g( Settings.fave ? &imgrankIcon_gray : &imgabcIcon_gray ); GuiImage abcBtnImg_g( Settings.fave ? &imgrankIcon_gray : &imgabcIcon_gray );
if ( abcBtnImg_g.GetImage() == NULL ) { abcBtnImg_g = abcBtnImg; abcBtnImg_g.SetGrayscale();} if ( abcBtnImg_g.GetImage() == NULL ) { abcBtnImg_g = abcBtnImg; abcBtnImg_g.SetGrayscale();}
abcBtnImg_g.SetWidescreen( CFG.widescreen ); abcBtnImg_g.SetWidescreen( CFG.widescreen );
@ -338,7 +333,6 @@ int MenuDiscList()
countBtnTT.SetAlpha( THEME.tooltipAlpha ); countBtnTT.SetAlpha( THEME.tooltipAlpha );
GuiImage countBtnImg( &imgplayCountIcon ); GuiImage countBtnImg( &imgplayCountIcon );
countBtnImg.SetWidescreen( CFG.widescreen ); countBtnImg.SetWidescreen( CFG.widescreen );
// GuiImage countBtnImg_g(countBtnImg); countBtnImg_g.SetGrayscale();
GuiImage countBtnImg_g( &imgplayCountIcon_gray ); GuiImage countBtnImg_g( &imgplayCountIcon_gray );
if ( countBtnImg_g.GetImage() == NULL ) { countBtnImg_g = countBtnImg; countBtnImg_g.SetGrayscale();} if ( countBtnImg_g.GetImage() == NULL ) { countBtnImg_g = countBtnImg; countBtnImg_g.SetGrayscale();}
countBtnImg_g.SetWidescreen( CFG.widescreen ); countBtnImg_g.SetWidescreen( CFG.widescreen );
@ -351,7 +345,6 @@ int MenuDiscList()
listBtnTT.SetAlpha( THEME.tooltipAlpha ); listBtnTT.SetAlpha( THEME.tooltipAlpha );
GuiImage listBtnImg( &imgarrangeList ); GuiImage listBtnImg( &imgarrangeList );
listBtnImg.SetWidescreen( CFG.widescreen ); listBtnImg.SetWidescreen( CFG.widescreen );
// GuiImage listBtnImg_g(listBtnImg); listBtnImg_g.SetGrayscale();
GuiImage listBtnImg_g( &imgarrangeList_gray ); GuiImage listBtnImg_g( &imgarrangeList_gray );
if ( listBtnImg_g.GetImage() == NULL ) { listBtnImg_g = listBtnImg; listBtnImg_g.SetGrayscale();} if ( listBtnImg_g.GetImage() == NULL ) { listBtnImg_g = listBtnImg; listBtnImg_g.SetGrayscale();}
listBtnImg_g.SetWidescreen( CFG.widescreen ); listBtnImg_g.SetWidescreen( CFG.widescreen );
@ -364,7 +357,6 @@ int MenuDiscList()
gridBtnTT.SetAlpha( THEME.tooltipAlpha ); gridBtnTT.SetAlpha( THEME.tooltipAlpha );
GuiImage gridBtnImg( &imgarrangeGrid ); GuiImage gridBtnImg( &imgarrangeGrid );
gridBtnImg.SetWidescreen( CFG.widescreen ); gridBtnImg.SetWidescreen( CFG.widescreen );
// GuiImage gridBtnImg_g(gridBtnImg); gridBtnImg_g.SetGrayscale();
GuiImage gridBtnImg_g( &imgarrangeGrid_gray ); GuiImage gridBtnImg_g( &imgarrangeGrid_gray );
if ( gridBtnImg_g.GetImage() == NULL ) { gridBtnImg_g = gridBtnImg; gridBtnImg_g.SetGrayscale();} if ( gridBtnImg_g.GetImage() == NULL ) { gridBtnImg_g = gridBtnImg; gridBtnImg_g.SetGrayscale();}
gridBtnImg_g.SetWidescreen( CFG.widescreen ); gridBtnImg_g.SetWidescreen( CFG.widescreen );
@ -377,7 +369,6 @@ int MenuDiscList()
carouselBtnTT.SetAlpha( THEME.tooltipAlpha ); carouselBtnTT.SetAlpha( THEME.tooltipAlpha );
GuiImage carouselBtnImg( &imgarrangeCarousel ); GuiImage carouselBtnImg( &imgarrangeCarousel );
carouselBtnImg.SetWidescreen( CFG.widescreen ); carouselBtnImg.SetWidescreen( CFG.widescreen );
// GuiImage carouselBtnImg_g(carouselBtnImg); carouselBtnImg_g.SetGrayscale();
GuiImage carouselBtnImg_g( &imgarrangeCarousel_gray ); GuiImage carouselBtnImg_g( &imgarrangeCarousel_gray );
if ( carouselBtnImg_g.GetImage() == NULL ) { carouselBtnImg_g = carouselBtnImg; carouselBtnImg_g.SetGrayscale();} if ( carouselBtnImg_g.GetImage() == NULL ) { carouselBtnImg_g = carouselBtnImg; carouselBtnImg_g.SetGrayscale();}
carouselBtnImg_g.SetWidescreen( CFG.widescreen ); carouselBtnImg_g.SetWidescreen( CFG.widescreen );
@ -426,8 +417,7 @@ int MenuDiscList()
dvdBtnTT.SetAlpha( THEME.tooltipAlpha ); dvdBtnTT.SetAlpha( THEME.tooltipAlpha );
GuiImage dvdBtnImg( &imgdvd ); GuiImage dvdBtnImg( &imgdvd );
dvdBtnImg.SetWidescreen( CFG.widescreen ); dvdBtnImg.SetWidescreen( CFG.widescreen );
GuiImage dvdBtnImg_g( dvdBtnImg ); //dvdBtnImg_g.SetGrayscale(); GuiImage dvdBtnImg_g( dvdBtnImg );
// GuiImage carouselBtnImg_g(&imgarrangeCarousel_gray);
dvdBtnImg_g.SetWidescreen( CFG.widescreen ); dvdBtnImg_g.SetWidescreen( CFG.widescreen );
GuiButton dvdBtn( &dvdBtnImg_g, &dvdBtnImg_g, ALIGN_LEFT, ALIGN_TOP, THEME.gamelist_dvd_x, THEME.gamelist_dvd_y, &trigA, &btnSoundOver, btnClick2, 1, &dvdBtnTT, 15, 52, 1, 3 ); GuiButton dvdBtn( &dvdBtnImg_g, &dvdBtnImg_g, ALIGN_LEFT, ALIGN_TOP, THEME.gamelist_dvd_x, THEME.gamelist_dvd_y, &trigA, &btnSoundOver, btnClick2, 1, &dvdBtnTT, 15, 52, 1, 3 );
dvdBtn.SetAlpha( 180 ); dvdBtn.SetAlpha( 180 );
@ -682,7 +672,7 @@ int MenuDiscList()
if ( idiotFlag == 1 ) if ( idiotFlag == 1 )
{ {
gprintf( "\n\tIdiot flag" ); gprintf( "\tIdiot flag\n" );
char idiotBuffer[200]; char idiotBuffer[200];
snprintf( idiotBuffer, sizeof( idiotBuffer ), "%s (%s). %s", tr( "You have attempted to load a bad image" ), snprintf( idiotBuffer, sizeof( idiotBuffer ), "%s (%s). %s", tr( "You have attempted to load a bad image" ),
idiotChar, tr( "Most likely it has dimensions that are not evenly divisible by 4." ) ); idiotChar, tr( "Most likely it has dimensions that are not evenly divisible by 4." ) );
@ -717,7 +707,7 @@ int MenuDiscList()
} }
//CLOCK //CLOCK
time_t rawtime = time( 0 ); //this fixes code dump caused by the clock time_t rawtime = time( 0 );
if ( ( ( Settings.hddinfo == hr12 ) || ( Settings.hddinfo == hr24 ) ) && rawtime != lastrawtime ) if ( ( ( Settings.hddinfo == hr12 ) || ( Settings.hddinfo == hr24 ) ) && rawtime != lastrawtime )
{ {
lastrawtime = rawtime; lastrawtime = rawtime;
@ -761,7 +751,7 @@ int MenuDiscList()
if ( updateavailable == true ) if ( updateavailable == true )
{ {
gprintf( "\n\tUpdate Available" ); gprintf( "\tUpdate Available\n" );
HaltGui(); HaltGui();
GuiWindow ww( 640, 480 ); GuiWindow ww( 640, 480 );
w.SetState( STATE_DISABLED ); w.SetState( STATE_DISABLED );
@ -778,7 +768,7 @@ int MenuDiscList()
{ {
gprintf( "\n\tpoweroffBtn clicked" ); gprintf( "\tpoweroffBtn clicked\n" );
choice = WindowPrompt( tr( "How to Shutdown?" ), 0, tr( "Full Shutdown" ), tr( "Shutdown to Idle" ), tr( "Cancel" ) ); choice = WindowPrompt( tr( "How to Shutdown?" ), 0, tr( "Full Shutdown" ), tr( "Shutdown to Idle" ), tr( "Cancel" ) );
if ( choice == 2 ) if ( choice == 2 )
{ {
@ -808,7 +798,7 @@ int MenuDiscList()
} }
else if ( gamecntBtn.GetState() == STATE_CLICKED && mountMethod != 3 ) else if ( gamecntBtn.GetState() == STATE_CLICKED && mountMethod != 3 )
{ {
gprintf( "\n\tgameCntBtn clicked" ); gprintf( "\tgameCntBtn clicked\n" );
gamecntBtn.ResetState(); gamecntBtn.ResetState();
char linebuf[150]; char linebuf[150];
snprintf( linebuf, sizeof( linebuf ), "%s %sGameList ?", tr( "Save Game List to" ), Settings.update_path ); snprintf( linebuf, sizeof( linebuf ), "%s %sGameList ?", tr( "Save Game List to" ), Settings.update_path );
@ -826,16 +816,13 @@ int MenuDiscList()
} }
else if ( screenShotBtn.GetState() == STATE_CLICKED ) else if ( screenShotBtn.GetState() == STATE_CLICKED )
{ {
gprintf( "\n\tscreenShotBtn clicked" ); gprintf( "\tscreenShotBtn clicked\n" );
screenShotBtn.ResetState(); screenShotBtn.ResetState();
ScreenShot(); ScreenShot();
gprintf( "...It's easy, mmmmmmKay" );
} }
else if ( homeBtn.GetState() == STATE_CLICKED ) else if ( homeBtn.GetState() == STATE_CLICKED )
{ {
gprintf( "\n\thomeBtn clicked" ); gprintf( "\thomeBtn clicked\n" );
bgMusic->Pause(); bgMusic->Pause();
choice = WindowExitPrompt(); choice = WindowExitPrompt();
bgMusic->Resume(); bgMusic->Resume();
@ -868,7 +855,7 @@ int MenuDiscList()
} }
else if ( wiiBtn.GetState() == STATE_CLICKED ) else if ( wiiBtn.GetState() == STATE_CLICKED )
{ {
gprintf( "\n\twiiBtn clicked" ); gprintf( "\twiiBtn clicked\n" );
dataed++; dataed++;
wiiBtn.ResetState(); wiiBtn.ResetState();
@ -912,7 +899,7 @@ int MenuDiscList()
} }
else if ( ( covert & 0x2 ) && ( covert != covertOld ) ) else if ( ( covert & 0x2 ) && ( covert != covertOld ) )
{ {
gprintf( "\n\tNew Disc Detected" ); gprintf( "\tNew Disc Detected\n" );
choice = WindowPrompt( tr( "New Disc Detected" ), 0, tr( "Install" ), tr( "Mount DVD drive" ), tr( "Cancel" ) ); choice = WindowPrompt( tr( "New Disc Detected" ), 0, tr( "Install" ), tr( "Mount DVD drive" ), tr( "Cancel" ) );
if ( choice == 1 ) if ( choice == 1 )
{ {
@ -942,7 +929,7 @@ int MenuDiscList()
else if ( sdcardBtn.GetState() == STATE_CLICKED ) else if ( sdcardBtn.GetState() == STATE_CLICKED )
{ {
gprintf( "\n\tsdCardBtn Clicked" ); gprintf( "\tsdCardBtn Clicked\n" );
SDCard_deInit(); SDCard_deInit();
SDCard_Init(); SDCard_Init();
if ( Settings.gameDisplay == list ) if ( Settings.gameDisplay == list )
@ -973,7 +960,7 @@ int MenuDiscList()
else if ( DownloadBtn.GetState() == STATE_CLICKED ) else if ( DownloadBtn.GetState() == STATE_CLICKED )
{ {
gprintf( "\n\tDownloadBtn Clicked" ); gprintf( "\tDownloadBtn Clicked\n" );
if ( isInserted( bootDevice ) ) if ( isInserted( bootDevice ) )
{ {
choice = WindowPrompt( tr( "Cover Download" ), 0, tr( "Normal Covers" ), tr( "3D Covers" ), tr( "Disc Images" ), tr( "Back" ) ); // ask for download choice choice = WindowPrompt( tr( "Cover Download" ), 0, tr( "Normal Covers" ), tr( "3D Covers" ), tr( "Disc Images" ), tr( "Back" ) ); // ask for download choice
@ -1033,7 +1020,7 @@ int MenuDiscList()
else if ( settingsBtn.GetState() == STATE_CLICKED ) else if ( settingsBtn.GetState() == STATE_CLICKED )
{ {
gprintf( "\n\tsettingsBtn Clicked" ); gprintf( "\tsettingsBtn Clicked\n" );
if ( Settings.gameDisplay == list ) if ( Settings.gameDisplay == list )
{ {
startat = gameBrowser->GetSelectedOption(); startat = gameBrowser->GetSelectedOption();
@ -1056,7 +1043,7 @@ int MenuDiscList()
else if ( favoriteBtn.GetState() == STATE_CLICKED ) else if ( favoriteBtn.GetState() == STATE_CLICKED )
{ {
gprintf( "\n\tfavoriteBtn Clicked" ); gprintf( "\tfavoriteBtn Clicked\n" );
Settings.fave = !Settings.fave; Settings.fave = !Settings.fave;
if ( isInserted( bootDevice ) ) if ( isInserted( bootDevice ) )
{ {
@ -1071,7 +1058,7 @@ int MenuDiscList()
else if ( searchBtn.GetState() == STATE_CLICKED && mountMethod != 3 ) else if ( searchBtn.GetState() == STATE_CLICKED && mountMethod != 3 )
{ {
gprintf( "\n\tsearchBtn Clicked" ); gprintf( "\tsearchBtn Clicked\n" );
show_searchwindow = !show_searchwindow; show_searchwindow = !show_searchwindow;
HaltGui(); HaltGui();
if ( searchBar ) if ( searchBar )
@ -1082,12 +1069,12 @@ int MenuDiscList()
} }
if ( show_searchwindow ) if ( show_searchwindow )
{ {
if ( *gameList.GetCurrentFilter() ) if ( *gameList.GetCurrentFilter() )
{ {
searchBtn.StopEffect(); searchBtn.StopEffect();
searchBtn.SetEffectGrow(); searchBtn.SetEffectGrow();
} }
searchBar = new GuiSearchBar( gameList.GetAvailableSearchChars() ); searchBar = new GuiSearchBar( gameList.GetAvailableSearchChars() );
if ( searchBar ) if ( searchBar )
mainWindow->Append( searchBar ); mainWindow->Append( searchBar );
} }
@ -1160,7 +1147,7 @@ int MenuDiscList()
else if ( abcBtn.GetState() == STATE_CLICKED ) else if ( abcBtn.GetState() == STATE_CLICKED )
{ {
gprintf( "\n\tabcBtn clicked" ); gprintf( "\tabcBtn clicked\n" );
if ( Settings.sort != ALL ) if ( Settings.sort != ALL )
{ {
Settings.sort = ALL; Settings.sort = ALL;
@ -1178,11 +1165,10 @@ int MenuDiscList()
else if ( countBtn.GetState() == STATE_CLICKED ) else if ( countBtn.GetState() == STATE_CLICKED )
{ {
gprintf( "\n\tcountBtn Clicked" ); gprintf( "\tcountBtn Clicked\n" );
if ( Settings.sort != PLAYCOUNT ) if ( Settings.sort != PLAYCOUNT )
{ {
Settings.sort = PLAYCOUNT; Settings.sort = PLAYCOUNT;
//if(isSdInserted()) {
if ( isInserted( bootDevice ) ) if ( isInserted( bootDevice ) )
{ {
cfg_save_global(); cfg_save_global();
@ -1198,7 +1184,7 @@ int MenuDiscList()
else if ( listBtn.GetState() == STATE_CLICKED ) else if ( listBtn.GetState() == STATE_CLICKED )
{ {
gprintf( "\n\tlistBtn Clicked" ); gprintf( "\tlistBtn Clicked\n" );
if ( Settings.gameDisplay != list ) if ( Settings.gameDisplay != list )
{ {
Settings.gameDisplay = list; Settings.gameDisplay = list;
@ -1216,10 +1202,9 @@ int MenuDiscList()
} }
} }
else if ( gridBtn.GetState() == STATE_CLICKED ) else if ( gridBtn.GetState() == STATE_CLICKED )
{ {
gprintf( "\n\tgridBtn Clicked" ); gprintf( "\tgridBtn Clicked\n" );
if ( Settings.gameDisplay != grid ) if ( Settings.gameDisplay != grid )
{ {
@ -1240,7 +1225,7 @@ int MenuDiscList()
else if ( carouselBtn.GetState() == STATE_CLICKED ) else if ( carouselBtn.GetState() == STATE_CLICKED )
{ {
gprintf( "\n\tcarouselBtn Clicked" ); gprintf( "\tcarouselBtn Clicked\n" );
if ( Settings.gameDisplay != carousel ) if ( Settings.gameDisplay != carousel )
{ {
Settings.gameDisplay = carousel; Settings.gameDisplay = carousel;
@ -1257,15 +1242,17 @@ int MenuDiscList()
carouselBtn.ResetState(); carouselBtn.ResetState();
} }
} }
else if ( homebrewBtn.GetState() == STATE_CLICKED )
else if ( homebrewBtn.GetState() == STATE_CLICKED )
{ {
gprintf( "\n\thomebrewBtn Clicked" ); gprintf( "\thomebrewBtn Clicked\n" );
menu = MENU_HOMEBREWBROWSE; menu = MENU_HOMEBREWBROWSE;
break; break;
} }
else if ( gameInfo.GetState() == STATE_CLICKED && mountMethod != 3 )
else if ( gameInfo.GetState() == STATE_CLICKED && mountMethod != 3 )
{ {
gprintf( "\n\tgameinfo Clicked" ); gprintf( "\tgameinfo Clicked\n" );
gameInfo.ResetState(); gameInfo.ResetState();
if ( selectImg1 >= 0 && selectImg1 < ( s32 )gameList.size() ) if ( selectImg1 >= 0 && selectImg1 < ( s32 )gameList.size() )
{ {
@ -1286,7 +1273,7 @@ int MenuDiscList()
} }
else if ( lockBtn.GetState() == STATE_CLICKED ) else if ( lockBtn.GetState() == STATE_CLICKED )
{ {
gprintf( "\n\tlockBtn clicked" ); gprintf( "\tlockBtn clicked\n" );
lockBtn.ResetState(); lockBtn.ResetState();
if ( !canUnlock ) if ( !canUnlock )
{ {
@ -1338,7 +1325,7 @@ int MenuDiscList()
} }
else if ( dvdBtn.GetState() == STATE_CLICKED ) else if ( dvdBtn.GetState() == STATE_CLICKED )
{ {
gprintf( "\n\tdvdBtn Clicked" ); gprintf( "\tdvdBtn Clicked\n" );
mountMethodOLD = ( mountMethod == 3 ? mountMethod : 0 ); mountMethodOLD = ( mountMethod == 3 ? mountMethod : 0 );
mountMethod = DiscMount( dvdheader ); mountMethod = DiscMount( dvdheader );
@ -1567,7 +1554,7 @@ int MenuDiscList()
exeFile = fopen ( nipple , "rb" ); exeFile = fopen ( nipple , "rb" );
if ( exeFile == NULL ) if ( exeFile == NULL )
{ {
gprintf( "\n\ttried to load missing gct." ); gprintf( "\ttried to load missing gct.\n" );
sprintf( nipple, "%s %s", nipple, tr( "does not exist! Loading game without cheats." ) ); sprintf( nipple, "%s %s", nipple, tr( "does not exist! Loading game without cheats." ) );
WindowPrompt( tr( "Error" ), nipple, NULL, NULL, NULL, NULL, 170 ); WindowPrompt( tr( "Error" ), nipple, NULL, NULL, NULL, NULL, 170 );
} }
@ -1640,7 +1627,7 @@ int MenuDiscList()
exeFile = fopen ( nipple , "rb" ); exeFile = fopen ( nipple , "rb" );
if ( exeFile == NULL ) if ( exeFile == NULL )
{ {
gprintf( "\n\ttried to load gct file that isn't there" ); gprintf( "\ttried to load gct file that isn't there\n" );
sprintf( nipple, "%s %s", nipple, tr( "does not exist! Loading game without cheats." ) ); sprintf( nipple, "%s %s", nipple, tr( "does not exist! Loading game without cheats." ) );
WindowPrompt( tr( "Error" ), nipple, NULL, NULL, NULL, NULL, 170 ); WindowPrompt( tr( "Error" ), nipple, NULL, NULL, NULL, NULL, 170 );
} }

28
source/prompts/PromptWindows.cpp
View File

@ -231,7 +231,7 @@ int OnScreenKeyboard( char * var, u32 maxlen, int min )
***************************************************************************/ ***************************************************************************/
void WindowCredits() void WindowCredits()
{ {
gprintf( "\nWindowCredits()" ); gprintf( "WindowCredits()\n" );
int angle = 0; int angle = 0;
GuiSound * creditsMusic = NULL; GuiSound * creditsMusic = NULL;
@ -465,7 +465,7 @@ void WindowCredits()
***************************************************************************/ ***************************************************************************/
int WindowScreensaver() int WindowScreensaver()
{ {
gprintf( "\nWindowScreenSaver()" ); gprintf( "WindowScreenSaver()\n" );
int i = 0; int i = 0;
bool exit = false; bool exit = false;
char imgPath[100];//uncomment for themable screensaver char imgPath[100];//uncomment for themable screensaver
@ -532,7 +532,7 @@ int WindowPrompt( const char *title, const char *msg, const char *btn1Label,
{ {
int choice = -1; int choice = -1;
int count = wait; int count = wait;
gprintf( "\nWindowPrompt(%s, %s, %s, %s, %s, %s, %i)", title, msg, btn1Label, btn2Label, btn3Label, btn4Label, wait ); gprintf( "WindowPrompt( %s, %s, %s, %s, %s, %s, %i ): ", title, msg, btn1Label, btn2Label, btn3Label, btn4Label, wait );
GuiWindow promptWindow( 472, 320 ); GuiWindow promptWindow( 472, 320 );
@ -799,11 +799,9 @@ int WindowPrompt( const char *title, const char *msg, const char *btn1Label,
choice = 0; choice = 0;
} }
else if ( screenShotBtn.GetState() == STATE_CLICKED ) else if ( screenShotBtn.GetState() == STATE_CLICKED )
{ {
gprintf( "\n\tscreenShotBtn clicked" );
screenShotBtn.ResetState(); screenShotBtn.ResetState();
ScreenShot(); ScreenShot();
gprintf( "...It's easy, mmmmmmKay" );
} }
if ( count > 0 )count--; if ( count > 0 )count--;
if ( count == 0 ) choice = 1; if ( count == 0 ) choice = 1;
@ -815,7 +813,7 @@ int WindowPrompt( const char *title, const char *msg, const char *btn1Label,
mainWindow->Remove( &promptWindow ); mainWindow->Remove( &promptWindow );
mainWindow->SetState( STATE_DEFAULT ); mainWindow->SetState( STATE_DEFAULT );
ResumeGui(); ResumeGui();
gprintf( " = %i", choice ); gprintf( " %i\n", choice );
return choice; return choice;
} }
@ -832,7 +830,7 @@ int WindowPrompt( const char *title, const char *msg, const char *btn1Label,
***************************************************************************/ ***************************************************************************/
int WindowExitPrompt() int WindowExitPrompt()
{ {
gprintf( "\nWindowExitPrompt()" ); gprintf( "WindowExitPrompt()\n" );
GuiSound * homein = NULL; GuiSound * homein = NULL;
homein = new GuiSound( menuin_ogg, menuin_ogg_size, Settings.sfxvolume ); homein = new GuiSound( menuin_ogg, menuin_ogg_size, Settings.sfxvolume );
@ -1187,7 +1185,7 @@ int GameWindowPrompt()
GuiSound * gameSound = NULL; GuiSound * gameSound = NULL;
gprintf( "\nGameWindowPrompt()" ); gprintf( "GameWindowPrompt()\n" );
GuiWindow promptWindow( 472, 320 ); GuiWindow promptWindow( 472, 320 );
promptWindow.SetAlignment( ALIGN_CENTRE, ALIGN_MIDDLE ); promptWindow.SetAlignment( ALIGN_CENTRE, ALIGN_MIDDLE );
promptWindow.SetPosition( 0, -10 ); promptWindow.SetPosition( 0, -10 );
@ -1439,7 +1437,7 @@ int GameWindowPrompt()
snprintf ( ID, sizeof( ID ), "%c%c%c", header->id[0], header->id[1], header->id[2] ); snprintf ( ID, sizeof( ID ), "%c%c%c", header->id[0], header->id[1], header->id[2] );
snprintf ( IDFull, sizeof( IDFull ), "%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2], header->id[3], header->id[4], header->id[5] ); snprintf ( IDFull, sizeof( IDFull ), "%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2], header->id[3], header->id[4], header->id[5] );
gprintf( "\n\t%s", IDFull ); gprintf( "\t%s\n", IDFull );
if ( diskCover ) if ( diskCover )
delete diskCover; delete diskCover;
@ -1674,11 +1672,9 @@ int GameWindowPrompt()
btnFavorite5.ResetState(); btnFavorite5.ResetState();
} }
else if ( screenShotBtn.GetState() == STATE_CLICKED ) else if ( screenShotBtn.GetState() == STATE_CLICKED )
{ {
gprintf( "\n\tscreenShotBtn clicked" );
screenShotBtn.ResetState(); screenShotBtn.ResetState();
ScreenShot(); ScreenShot();
gprintf( "...It's easy, mmmmmmKay" );
} }
// this next part is long because nobody could agree on what the left/right buttons should do // this next part is long because nobody could agree on what the left/right buttons should do
else if ( ( btnRight.GetState() == STATE_CLICKED ) && ( Settings.xflip == no ) ) //next game else if ( ( btnRight.GetState() == STATE_CLICKED ) && ( Settings.xflip == no ) ) //next game
@ -1803,7 +1799,7 @@ int GameWindowPrompt()
} }
bgMusic->SetVolume( Settings.volume ); bgMusic->SetVolume( Settings.volume );
gprintf( "\n\treturn %i", choice ); gprintf( "\tret: %i\n", choice );
return choice; return choice;
} }

2
source/usbloader/GameList.cpp
View File

@ -98,6 +98,8 @@ int GameList::ReadGameList()
static bool WCharSortCallback( const wchar_t char1, const wchar_t char2 ) static bool WCharSortCallback( const wchar_t char1, const wchar_t char2 )
{ {
if( char2 == 0 )return true;
if( char1 == 0 )return false;
return char2 > char1; return char2 > char1;
} }