diff --git a/HBC/META.XML b/HBC/META.XML index c215c8dd..d919f276 100644 --- a/HBC/META.XML +++ b/HBC/META.XML @@ -2,8 +2,8 @@ USB Loader GX USB Loader GX Team - 2.0 r1075 - 201102251818 + 2.0 r1076 + 201103142120 Loads games from USB-devices 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. diff --git a/Languages/french.lang b/Languages/french.lang index 1acbebeb..fb2091ab 100644 --- a/Languages/french.lang +++ b/Languages/french.lang @@ -1,5 +1,5 @@ # USB Loader GX language source file. -# French.lang for r1065 +# French.lang for r1076 (2.1) # don't delete/change this line (é). msgid "" msgstr "" @@ -166,7 +166,7 @@ msgid "AutoInit Network" msgstr "AutoInit réseau" msgid "Automatic port switching is done on the fly. You need to change all custom paths to SD-Card first for this option or else it could damage a filesystem." -msgstr "" +msgstr "Vous devez placer tous les dossiers personnalisés sur la carte SD avant d'utiliser cette option, sinon vous risquez d'endommager les données de vos disques USB." msgid "BCA Codes Path" msgstr "Dossier codes BCA" @@ -244,10 +244,10 @@ msgid "Both" msgstr "Les deux" msgid "Both Ports" -msgstr "" +msgstr "Les deux ports" msgid "Cache Titles" -msgstr "" +msgstr "Titres en cache" msgid "Can't be formatted" msgstr "Formatage impossible" @@ -406,7 +406,7 @@ msgid "Design:" msgstr "Graphisme:" msgid "Details" -msgstr "" +msgstr "Détails" msgid "Developed by" msgstr "Développé par" @@ -607,7 +607,7 @@ msgid "Flip-X" msgstr "Inversion-X" msgid "Font Scale Factor" -msgstr "" +msgstr "Échelle police" msgid "Force NTSC" msgstr "Forcer NTSC" @@ -1325,10 +1325,10 @@ msgid "USB Loader GX is protected" msgstr "USB Loader GX est verrouillé" msgid "USB Port" -msgstr "" +msgstr "Port USB" msgid "USB Port changing is only supported on Hermes cIOS." -msgstr "" +msgstr "Le changement de port USB n'est supporté qu'avec les cIOS d'Hermes." msgid "Uninstall Game" msgstr "Désinstaller le jeu" @@ -1419,7 +1419,7 @@ msgid "WiFi Features" msgstr "Connexion WiFi" msgid "Widescreen Factor" -msgstr "" +msgstr "Échelle interface 16:9" msgid "Widescreen Fix" msgstr "16:9" diff --git a/source/BoxCover/BoxCover.cpp b/source/BoxCover/BoxCover.cpp index 76b6c2d6..2d5627a9 100644 --- a/source/BoxCover/BoxCover.cpp +++ b/source/BoxCover/BoxCover.cpp @@ -194,7 +194,7 @@ void BoxCover::Update(GuiTrigger * t) void BoxCover::Draw() { - u8 BoxAlpha = (int) (alpha+angleDyn) & 0xFF; + u8 BoxAlpha = (int) (alpha+alphaDyn) & 0xFF; GX_LoadProjectionMtx(projection, GX_PERSPECTIVE); diff --git a/source/Controls/PartitionHandle.cpp b/source/Controls/PartitionHandle.cpp index a8c624c9..7ebd408e 100644 --- a/source/Controls/PartitionHandle.cpp +++ b/source/Controls/PartitionHandle.cpp @@ -162,7 +162,7 @@ bool PartitionHandle::Mount(int pos, const char * name, bool forceFAT) if(strncmp(GetFSName(pos), "NTFS", 4) == 0 || strcmp(GetFSName(pos), "GUID-Entry") == 0) { - if(ntfsMount(MountNameList[pos].c_str(), interface, GetLBAStart(pos), CACHE, SECTORS, NTFS_SHOW_HIDDEN_FILES | NTFS_IGNORE_CASE | NTFS_RECOVER)) + if(ntfsMount(MountNameList[pos].c_str(), interface, GetLBAStart(pos), CACHE, SECTORS, NTFS_SHOW_HIDDEN_FILES | NTFS_RECOVER)) { PartitionList[pos].FSName = "NTFS"; return true; diff --git a/source/patches/fst.c b/source/patches/fst.c index 4a4924b6..be146817 100644 --- a/source/patches/fst.c +++ b/source/patches/fst.c @@ -225,7 +225,7 @@ void app_loadgameconfig(char *discid) gameidmatch = 0; goto idmatch; } - if (strncmp(discid, parsebuffer, strlen(parsebuffer)) == 0) + if (strncasecmp(discid, parsebuffer, strlen(parsebuffer)) == 0) { gameidmatch += strlen(parsebuffer); idmatch: if (gameidmatch > maxgameidmatch2) diff --git a/source/prompts/PromptWindows.cpp b/source/prompts/PromptWindows.cpp index 8522a749..6136bd4f 100644 --- a/source/prompts/PromptWindows.cpp +++ b/source/prompts/PromptWindows.cpp @@ -242,9 +242,9 @@ void WindowCredits() char SvnRev[30]; #ifdef FULLCHANNEL - snprintf(SvnRev, sizeof(SvnRev), "v2.1c RC1 IOS%u (Rev %u)", IOS_GetVersion(), IOS_GetRevision()); + snprintf(SvnRev, sizeof(SvnRev), "v2.1c IOS%u (Rev %u)", IOS_GetVersion(), IOS_GetRevision()); #else - snprintf(SvnRev, sizeof(SvnRev), "v2.1 RC1 IOS%u (Rev %u)", IOS_GetVersion(), IOS_GetRevision()); + snprintf(SvnRev, sizeof(SvnRev), "v2.1 IOS%u (Rev %u)", IOS_GetVersion(), IOS_GetRevision()); #endif txt[i] = new GuiText(SvnRev, 16, ( GXColor ) {255, 255, 255, 255}); diff --git a/source/settings/CGameSettings.cpp b/source/settings/CGameSettings.cpp index e4ecd980..0dff8730 100644 --- a/source/settings/CGameSettings.cpp +++ b/source/settings/CGameSettings.cpp @@ -50,7 +50,7 @@ GameCFG * CGameSettings::GetGameCFG(const char * id) for(u32 i = 0; i < GameList.size(); ++i) { - if(strncmp(id, GameList[i].id, 6) == 0) + if(strncasecmp(id, GameList[i].id, 6) == 0) { return &GameList[i]; } @@ -66,7 +66,7 @@ bool CGameSettings::AddGame(const GameCFG & NewGame) { for(u32 i = 0; i < GameList.size(); ++i) { - if(strncmp(NewGame.id, GameList[i].id, 6) == 0) + if(strncasecmp(NewGame.id, GameList[i].id, 6) == 0) { memcpy(&GameList[i], &NewGame, sizeof(GameCFG)); return true; @@ -93,7 +93,7 @@ bool CGameSettings::Remove(const char * id) for(u32 i = 0; i < GameList.size(); ++i) { - if(strncmp(id, GameList[i].id, 6) == 0) + if(strncasecmp(id, GameList[i].id, 6) == 0) { GameList.erase(GameList.begin()+i); break; diff --git a/source/settings/CGameStatistics.cpp b/source/settings/CGameStatistics.cpp index deba3efb..6ab6f0df 100644 --- a/source/settings/CGameStatistics.cpp +++ b/source/settings/CGameStatistics.cpp @@ -27,7 +27,7 @@ GameStatus * CGameStatistics::GetGameStatus(const char * id) const for(u32 i = 0; i < GameList.size(); ++i) { - if(strncmp(id, GameList[i].id, 6) == 0) + if(strncasecmp(id, GameList[i].id, 6) == 0) { return (GameStatus *) &GameList[i]; } @@ -40,7 +40,7 @@ bool CGameStatistics::AddGame(const GameStatus & NewGame) { for(u32 i = 0; i < GameList.size(); ++i) { - if(strncmp(NewGame.id, GameList[i].id, 6) == 0) + if(strncasecmp(NewGame.id, GameList[i].id, 6) == 0) { memcpy(&GameList[i], &NewGame, sizeof(GameStatus)); return true; @@ -67,7 +67,7 @@ bool CGameStatistics::Remove(const char * id) for(u32 i = 0; i < GameList.size(); ++i) { - if(strncmp(id, GameList[i].id, 6) == 0) + if(strncasecmp(id, GameList[i].id, 6) == 0) { GameList.erase(GameList.begin()+i); break; diff --git a/source/settings/GameTitles.cpp b/source/settings/GameTitles.cpp index 23ef23b9..ec3d390d 100644 --- a/source/settings/GameTitles.cpp +++ b/source/settings/GameTitles.cpp @@ -176,7 +176,7 @@ void CGameTitles::RemoveUnusedCache(std::vector &MissingTitles) for(u32 n = 0; n < TitleList.size(); ++n) { - if(strncmp(TitleList[n].GameID, (const char *) gameList[i]->id, 6) == 0) + if(strncasecmp(TitleList[n].GameID, (const char *) gameList[i]->id, 6) == 0) { UsedCachedList[n] = true; isCached = true; diff --git a/source/settings/menus/GUISettingsMenu.cpp b/source/settings/menus/GUISettingsMenu.cpp index 503c2eed..b8e22050 100644 --- a/source/settings/menus/GUISettingsMenu.cpp +++ b/source/settings/menus/GUISettingsMenu.cpp @@ -30,6 +30,7 @@ #include "settings/SettingsPrompts.h" #include "settings/GameTitles.h" #include "xml/xml.h" +#include "usbloader/GameList.h" #include "usbloader/wbfs.h" #include "utils/tools.h" @@ -134,7 +135,11 @@ GuiSettingsMenu::GuiSettingsMenu() GuiSettingsMenu::~GuiSettingsMenu() { if (Settings.titlesOverride != OldTitlesOverride) + { GameTitles.LoadTitlesFromWiiTDB(Settings.titlestxt_path, true); + if(!Settings.titlesOverride) + gameList.ReadGameList(); + } } void GuiSettingsMenu::SetOptionValues() diff --git a/source/sounds/credits_music.ogg b/source/sounds/credits_music.ogg index 4010c41c..7d616121 100644 Binary files a/source/sounds/credits_music.ogg and b/source/sounds/credits_music.ogg differ diff --git a/source/themes/Resources.cpp b/source/themes/Resources.cpp index 7b1b7fa7..afe9040c 100644 --- a/source/themes/Resources.cpp +++ b/source/themes/Resources.cpp @@ -111,7 +111,7 @@ RecourceFile Resources::RecourceFiles[] = {"settings_title_over.png", settings_title_over_png, settings_title_over_png_size, NULL, 0}, {"pageindicator.png", pageindicator_png, pageindicator_png_size, NULL, 0}, {"Wiimote1.png", Wiimote1_png, Wiimote1_png_size, NULL, 0}, - {"Wiimote2.png", Wiimote2_png, Wiimote1_png_size, NULL, 0}, + {"Wiimote2.png", Wiimote2_png, Wiimote2_png_size, NULL, 0}, {"Wiimote4.png", Wiimote4_png, Wiimote4_png_size, NULL, 0}, {"wifi1.png", wifi1_png, wifi1_png_size, NULL, 0}, {"wifi2.png", wifi2_png, wifi2_png_size, NULL, 0}, diff --git a/source/usbloader/wbfs/wbfs_fat.cpp b/source/usbloader/wbfs/wbfs_fat.cpp index 8f0a8f9e..02bb7c02 100644 --- a/source/usbloader/wbfs/wbfs_fat.cpp +++ b/source/usbloader/wbfs/wbfs_fat.cpp @@ -208,7 +208,7 @@ s32 Wbfs_Fat::RemoveGame(u8 *discid) snprintf(name, sizeof(name), dirent->d_name); if (name[0] == '.') continue; if (name[6] != '_') continue; - if (strncmp(name, (char*) discid, 6) != 0) continue; + if (strncasecmp(name, (char*) discid, 6) != 0) continue; p = strrchr(name, '.'); if (!p) continue; if (strcasecmp(p, ".txt") != 0) continue; @@ -549,6 +549,9 @@ s32 Wbfs_Fat::GetHeadersCount() if(!tmpList) break; //out of memory, keep the list until now and stop + for(int j = 0; j < 6; ++j) + tmpHdr.id[j] = toupper((int) tmpHdr.id[j]); + fat_hdr_list = tmpList; memcpy(&fat_hdr_list[fat_hdr_count - 1], &tmpHdr, sizeof(struct discHdr)); } @@ -602,7 +605,7 @@ int Wbfs_Fat::FindFilename(u8 *id, char *fname, int len) u8 fn_id[8]; int n = fileext - dirent->d_name; // length withouth .wbfs if (!CheckLayoutB(dirent->d_name, n, fn_id, fn_title)) continue; - if (strncmp((char*) fn_id, gameID, 6) != 0) continue; + if (strncasecmp((char*) fn_id, gameID, 6) != 0) continue; snprintf(fname, len, "%s/%s", path, dirent->d_name); if (stat(fname, &st) == 0) break; }