From a1e6c04b89d21861988a0a20a229f678593b696b Mon Sep 17 00:00:00 2001
From: Cyan <cyan06@users.noreply.github.com>
Date: Wed, 4 Jan 2012 20:10:38 +0000
Subject: [PATCH] *Fixed Save game extraction for channels. It will extract to
 EmuNand Channel path. *Fixed Ocarina code downloading for Channels. *Moved
 portlib reference in makefile to fix possible compiling errors. (Thanks to
 Dimok for all those changes) *Update French and Italian language.

---
 HBC/META.XML                                  |   4 +-
 Languages/french.lang                         |   8 +-
 Languages/italian.lang                        | 111 +++---------------
 Makefile                                      |   4 +-
 source/prompts/PromptWindows.cpp              |   2 +-
 source/settings/menus/FeatureSettingsMenu.cpp |  15 ++-
 source/settings/menus/GameSettingsMenu.cpp    |  12 +-
 7 files changed, 50 insertions(+), 106 deletions(-)

diff --git a/HBC/META.XML b/HBC/META.XML
index 34df9455..b0fb28cf 100644
--- a/HBC/META.XML
+++ b/HBC/META.XML
@@ -2,8 +2,8 @@
 	<app version="1">
 		<name> USB Loader GX</name>
 		<coder>USB Loader GX Team</coder>
-		<version>2.3 r1145</version>
-		<release_date>201201031816</release_date>
+		<version>2.3 r1146</version>
+		<release_date>201201041810</release_date>
 		<!--   // remove this line to enable arguments
 		<arguments>
 				<arg>--ios=250</arg>
diff --git a/Languages/french.lang b/Languages/french.lang
index f294a33e..f72e32c1 100644
--- a/Languages/french.lang
+++ b/Languages/french.lang
@@ -1,5 +1,5 @@
 # USB Loader GX language source file.
-# French.lang - r1144
+# French.lang - r1146
 # don't delete/change this line (é).
 msgid ""
 msgstr ""
@@ -928,7 +928,7 @@ msgid "Install Partitions"
 msgstr "Installation"
 
 msgid "Install WAD to EmuNand"
-msgstr "Installer WAD sur EmuNand"
+msgstr "Installer WAD sur ÉmuNand"
 
 msgid "Install a game"
 msgstr "Installer un jeu"
@@ -937,13 +937,13 @@ msgid "Install finished"
 msgstr "Installation terminée"
 
 msgid "Installing content"
-msgstr "Installation contenu"
+msgstr "Installation du contenu"
 
 msgid "Installing game:"
 msgstr "Installation du jeu:"
 
 msgid "Installing title..."
-msgstr "Installation titre..."
+msgstr "Installation du titre..."
 
 msgid "Invalid wad file."
 msgstr "Fichier wad non valide."
diff --git a/Languages/italian.lang b/Languages/italian.lang
index 57968cf9..a67b2e10 100644
--- a/Languages/italian.lang
+++ b/Languages/italian.lang
@@ -1,5 +1,5 @@
 # USB Loader GX language source file.
-# italian.lang - r1142
+# italian.lang - r1146
 # don't delete/change this line (é).
 msgid ""
 msgstr ""
@@ -258,7 +258,7 @@ msgstr "Impossibile creare la cartella"
 
 #, c-format
 msgid "Can't create file: %s"
-msgstr ""
+msgstr "Impossibile creare il file: %s"
 
 #, c-format
 msgid "Can't create path: %s"
@@ -269,11 +269,11 @@ msgstr "Impossibile eliminare:"
 
 #, c-format
 msgid "Can't open file: %s"
-msgstr ""
+msgstr "Impossibile aprire il file: %s"
 
 #, c-format
 msgid "Can't read file: %s"
-msgstr ""
+msgstr "Impossibile leggere il file: %s"
 
 msgid "Cancel"
 msgstr "Annulla"
@@ -346,7 +346,7 @@ msgid "Content"
 msgstr "Nel contenuto"
 
 msgid "Continue"
-msgstr ""
+msgstr "Prosegui"
 
 msgid "Continue to install game?"
 msgstr "Proseguire con l'installarazione del gioco?"
@@ -682,13 +682,13 @@ msgid "Failed to open partition"
 msgstr "Accesso alla partizione fallito"
 
 msgid "Failed to read ticket."
-msgstr ""
+msgstr "Lettura del ticket fallita."
 
 msgid "Failed to read tmd file."
-msgstr ""
+msgstr "Lettura del file tmd fallita."
 
 msgid "Failed to read wad header."
-msgstr ""
+msgstr "Lettura dell'header del wad fallita."
 
 msgid "Failed updating"
 msgstr "Aggiornamento fallito"
@@ -706,7 +706,7 @@ msgid "File not found."
 msgstr "File non trovato."
 
 msgid "File read/write error."
-msgstr ""
+msgstr "Errore di lettura/scrittura nel file"
 
 msgid "Files extracted successfully."
 msgstr "File estratti con successo."
@@ -928,7 +928,7 @@ msgid "Install Partitions"
 msgstr "Installa Partizioni"
 
 msgid "Install WAD to EmuNand"
-msgstr ""
+msgstr "Installa WAD nella NAND Emulata"
 
 msgid "Install a game"
 msgstr "Installa un gioco"
@@ -937,16 +937,16 @@ msgid "Install finished"
 msgstr "Installazione completata"
 
 msgid "Installing content"
-msgstr ""
+msgstr "Intallando contenuto"
 
 msgid "Installing game:"
 msgstr "Intallando gioco:"
 
 msgid "Installing title..."
-msgstr ""
+msgstr "Intallando titolo..."
 
 msgid "Invalid wad file."
-msgstr ""
+msgstr "File WAD invalido."
 
 msgid "Issue manager /"
 msgstr "Gestore problemi /"
@@ -1596,7 +1596,7 @@ msgid "USB Port changing is only supported on Hermes cIOS."
 msgstr "Il cambio della porta USB è possibile solo con i cIOS di Hermes."
 
 msgid "Uninstall"
-msgstr ""
+msgstr "Disinstalla"
 
 msgid "Uninstall Game"
 msgstr "Disinstalla Gioco"
@@ -1675,7 +1675,7 @@ msgid "Virtual Pointer Speed"
 msgstr "Velocità Puntatore Virtuale"
 
 msgid "WAD Installation"
-msgstr ""
+msgstr "Installazione WAD"
 
 msgid "WDM Files Path"
 msgstr "Percorso dei file WDM"
@@ -1693,7 +1693,7 @@ msgid "Warning:"
 msgstr "Attenzione:"
 
 msgid "What do you want to do?"
-msgstr ""
+msgstr "Che cosa vuoi fare?"
 
 msgid "What do you want to update?"
 msgstr "Che cosa vuoi aggiornare?"
@@ -1745,7 +1745,7 @@ msgstr "Debugger Wiird"
 
 #, c-format
 msgid "Write error on file: %s"
-msgstr ""
+msgstr "Errore di scrittura sul file: %s"
 
 msgid "Writing GXGameCategories.xml"
 msgstr "Scrivendo GXGameCategories.xml"
@@ -1817,79 +1817,4 @@ msgid "of"
 msgstr "di"
 
 msgid "seconds left"
-msgstr "secondi rimanenti"
-
-#~ msgid ">> Deleting tickets..."
-#~ msgstr ">> Eliminando i ticket..."
-
-#~ msgid ">> Deleting tickets...ERROR! "
-#~ msgstr ">> Eliminando i ticket...ERRORE! "
-
-#~ msgid ">> Deleting tickets...Ok! "
-#~ msgstr ">> Eliminando i ticket...OK! "
-
-#~ msgid ">> Deleting title ...ERROR! "
-#~ msgstr ">> Eliminando titolo...ERRORE! "
-
-#~ msgid ">> Deleting title ...Ok!"
-#~ msgstr ">> Eliminando titolo...OK! "
-
-#~ msgid ">> Deleting title contents..."
-#~ msgstr ">> Eliminando contenuti..."
-
-#~ msgid ">> Deleting title contents...ERROR! "
-#~ msgstr ">> Eliminando contenuti...ERRORE! "
-
-#~ msgid ">> Deleting title contents...Ok!"
-#~ msgstr ">> Eliminando contenuti...OK! "
-
-#~ msgid ">> Deleting title..."
-#~ msgstr ">> Eliminando titolo..."
-
-#~ msgid ">> Finishing installation..."
-#~ msgstr ">> Ultimando l'installazione..."
-
-#~ msgid ">> Installing content #"
-#~ msgstr ">> Intallando contenuto #..."
-
-#~ msgid ">> Installing ticket..."
-#~ msgstr ">> Installando ticket..."
-
-#~ msgid ">> Installing title..."
-#~ msgstr ">> Installando titolo..."
-
-#~ msgid ">> Reading WAD data..."
-#~ msgstr ">> Leggendo dati WAD..."
-
-#~ msgid ">> Reading WAD data...ERROR! "
-#~ msgstr ">> Leggendo dati WAD...ERRORE! "
-
-#~ msgid ">> Reading WAD data...Ok!"
-#~ msgstr ">> Leggendo dati WAD...OK!"
-
-#~ msgid "Done!"
-#~ msgstr "Fatto!"
-
-#~ msgid "Error..."
-#~ msgstr "Errore..."
-
-#~ msgid "Finishing installation... Ok!"
-#~ msgstr "Completando l'installazione... OK!"
-
-#~ msgid "Installing content... Ok!"
-#~ msgstr "Intallando contenuto... OK!"
-
-#~ msgid "Installing ticket... Ok!"
-#~ msgstr "intallando ticket... OK!"
-
-#~ msgid "Installing title... Ok!"
-#~ msgstr "Intallando titolo... OK!"
-
-#~ msgid "Installing wad"
-#~ msgstr "Intallando WAD"
-
-#~ msgid "Reading WAD data... Ok!"
-#~ msgstr "Leggendo dati WAD... OK!"
-
-#~ msgid "Uninstalling wad"
-#~ msgstr "Disinstallando il WAD"
+msgstr "secondi rimanenti"
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 1b7c0584..e8f34398 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ LIBS :=  -lpngu -lpng -lgd -lm -lz -lwiiuse -lbte -lasnd -logc -lfreetype -lvorb
 # list of directories containing libraries, this must be the top level containing
 # include and lib
 #---------------------------------------------------------------------------------
-LIBDIRS	:= $(DEVKITPPC)/lib $(CURDIR) $(PORTLIBS)
+LIBDIRS	:= $(DEVKITPPC)/lib $(CURDIR)
 #---------------------------------------------------------------------------------
 # no real need to edit anything past this point unless you need to add additional
 # rules for different file extensions
@@ -141,7 +141,7 @@ export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
 #---------------------------------------------------------------------------------
 export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib) -L$(CURDIR)/source/libs/libfat/ \
 					-L$(CURDIR)/source/libs/libntfs/ -L$(CURDIR)/source/libs/libext2fs/ \
-					-L$(LIBOGC_LIB)
+					-L$(LIBOGC_LIB) -L$(PORTLIBS)
 
 export OUTPUT	:=	$(CURDIR)/$(TARGET)
 .PHONY: $(BUILD) lang all clean
diff --git a/source/prompts/PromptWindows.cpp b/source/prompts/PromptWindows.cpp
index 0c6d928c..25a4bda7 100644
--- a/source/prompts/PromptWindows.cpp
+++ b/source/prompts/PromptWindows.cpp
@@ -1310,7 +1310,7 @@ int CodeDownload(const char *id)
 		snprintf(txtpath, sizeof(txtpath), "%s%s.txt", Settings.TxtCheatcodespath, id);
 
 		char codeurl[250];
-		snprintf(codeurl, sizeof(codeurl), "http://geckocodes.org/codes/R/%s.txt", id);
+		snprintf(codeurl, sizeof(codeurl), "http://geckocodes.org/txt.php?txt=%s", id);
 
 		struct block file = downloadfile(codeurl);
 
diff --git a/source/settings/menus/FeatureSettingsMenu.cpp b/source/settings/menus/FeatureSettingsMenu.cpp
index 91d41791..59656e97 100644
--- a/source/settings/menus/FeatureSettingsMenu.cpp
+++ b/source/settings/menus/FeatureSettingsMenu.cpp
@@ -251,8 +251,19 @@ int FeatureSettingsMenu::GetMenuInternal()
 
 			for(int i = 0; i < gameList.size(); ++i)
 			{
-				snprintf(nandPath, sizeof(nandPath), "/title/00010000/%02x%02x%02x%02x", gameList[i]->id[0], gameList[i]->id[1], gameList[i]->id[2], gameList[i]->id[3]);
-				snprintf(filePath, sizeof(filePath), "%s%s", Settings.NandEmuPath, nandPath);
+				if(gameList[i]->type != TYPE_GAME_WII && gameList[i]->type != TYPE_GAME_NANDCHAN)
+					continue;
+				
+				if(gameList[i]->tid != 0) //! Channels
+				{
+					snprintf(nandPath, sizeof(nandPath), "/title/%08x/%08x/data", (u32) (gameList[i]->tid  >> 32), (u32) gameList[i]->tid );
+					snprintf(filePath, sizeof(filePath), "%s%s", Settings.NandEmuChanPath, nandPath);
+				}
+				else //! Wii games
+				{
+					snprintf(nandPath, sizeof(nandPath), "/title/00010000/%02x%02x%02x%02x", gameList[i]->id[0], gameList[i]->id[1], gameList[i]->id[2], gameList[i]->id[3]);
+					snprintf(filePath, sizeof(filePath), "%s%s", Settings.NandEmuPath, nandPath);
+				}
 
 				ShowProgress(tr("Extracting files:"), GameTitles.GetTitle(gameList[i]), 0, 0, -1, true, false);
 
diff --git a/source/settings/menus/GameSettingsMenu.cpp b/source/settings/menus/GameSettingsMenu.cpp
index 6fa543a4..68675b3f 100644
--- a/source/settings/menus/GameSettingsMenu.cpp
+++ b/source/settings/menus/GameSettingsMenu.cpp
@@ -143,8 +143,16 @@ void GameSettingsMenu::CreateSettingsMenu(int menuNr)
 		{
 			char filePath[512];
 			char nandPath[512];
-			snprintf(nandPath, sizeof(nandPath), "/title/00010000/%02x%02x%02x%02x", DiscHeader->id[0], DiscHeader->id[1], DiscHeader->id[2], DiscHeader->id[3]);
-			snprintf(filePath, sizeof(filePath), "%s%s", Settings.NandEmuPath, nandPath);
+			if(DiscHeader->tid != 0) //! Channels
+			{
+				snprintf(nandPath, sizeof(nandPath), "/title/%08x/%08x/data", (u32) (DiscHeader->tid >> 32), (u32) DiscHeader->tid);
+				snprintf(filePath, sizeof(filePath), "%s%s", Settings.NandEmuChanPath, nandPath);
+			}
+			else //! Wii games
+			{
+				snprintf(nandPath, sizeof(nandPath), "/title/00010000/%02x%02x%02x%02x", DiscHeader->id[0], DiscHeader->id[1], DiscHeader->id[2], DiscHeader->id[3]);
+				snprintf(filePath, sizeof(filePath), "%s%s", Settings.NandEmuPath, nandPath);
+			}
 
 			ProgressCancelEnable(true);
 			StartProgress(tr("Extracting file:"), 0, 0, true, false);