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

change the per game settings around a bit.

Browse Source 
made the channel browser read database.txt.  The text should be in the config path (because i couldn't think of a better place for it).  And the format for the txt is the first 3 chars of the 4 char ID, then any 1 character, then the name (read up to 51 chars.
eg.
ULN USB Loader GX Full Channel
HAX Homebrew Channel
HAT Nintendo Channel

The database for ATD mod follows this format, so its a great place to start.  If people are going to be passing around a database, it would be wise to keep custom channels off this, as my WADD that says WadManager is not the same as somebody else's WADQ which could be a self destruct or something.

Commented out the code that loads titles.txt.  It was reported that this file is keeping WiiSportsResort from loading on some Wiis.  And it isn't needed anymore since there is the xml file with all the names in it.  I left the code in though in case somebody thinks that it is actually useful.

Added 1 more game to the list of known alt dols.
This commit is contained in:
giantpune 2009-07-27 01:15:16 +00:00
parent cc590e1ac8
commit c6fd33eeb1
28 changed files with 848 additions and 453 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Languages/czech.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-25 17:16+0200\n" "POT-Creation-Date: 2009-07-26 19:54-0400\n"
"PO-Revision-Date: 2009-07-18 15:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n"
"Last-Translator: David Jelinek (djelinek@hotmail.com) \n" "Last-Translator: David Jelinek (djelinek@hotmail.com) \n"
"Language-Team: Last version on http://startgolf.tym.cz/czech.lang \n" "Language-Team: Last version on http://startgolf.tym.cz/czech.lang \n"

2
Languages/danish.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-25 17:16+0200\n" "POT-Creation-Date: 2009-07-26 19:54-0400\n"
"PO-Revision-Date: 2009-07-18 15:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"

2
Languages/dutch.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-25 17:16+0200\n" "POT-Creation-Date: 2009-07-26 19:54-0400\n"
"PO-Revision-Date: 2009-07-18 15:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n"
"Last-Translator: tj_cool\n" "Last-Translator: tj_cool\n"
"Language-Team: \n" "Language-Team: \n"

2
Languages/english.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-25 17:16+0200\n" "POT-Creation-Date: 2009-07-26 19:54-0400\n"
"PO-Revision-Date: 2009-07-18 15:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"

2
Languages/finnish.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-25 17:16+0200\n" "POT-Creation-Date: 2009-07-26 19:54-0400\n"
"PO-Revision-Date: 2009-07-18 15:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"

2
Languages/french.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-25 17:16+0200\n" "POT-Creation-Date: 2009-07-26 19:54-0400\n"
"PO-Revision-Date: 2009-07-18 15:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n"
"Last-Translator: Kin8\n" "Last-Translator: Kin8\n"
"Language-Team: Badablek, Amour, ikya, OuahOuah, dj_skual & Kin8\n" "Language-Team: Badablek, Amour, ikya, OuahOuah, dj_skual & Kin8\n"

2
Languages/german.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-25 17:16+0200\n" "POT-Creation-Date: 2009-07-26 19:54-0400\n"
"PO-Revision-Date: 2009-07-18 15:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"

2
Languages/hungarian.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-25 17:16+0200\n" "POT-Creation-Date: 2009-07-26 19:54-0400\n"
"PO-Revision-Date: 2009-07-18 15:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n"
"Last-Translator: Tusk\n" "Last-Translator: Tusk\n"
"Language-Team: \n" "Language-Team: \n"

2
Languages/italian.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-25 17:16+0200\n" "POT-Creation-Date: 2009-07-26 19:54-0400\n"
"PO-Revision-Date: 2009-07-24 11:00+0200\n" "PO-Revision-Date: 2009-07-24 11:00+0200\n"
"Last-Translator: Cambo \n" "Last-Translator: Cambo \n"
"Language-Team: FoxeJoe & Cambo\n" "Language-Team: FoxeJoe & Cambo\n"

2
Languages/japanese.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-25 17:16+0200\n" "POT-Creation-Date: 2009-07-26 19:54-0400\n"
"PO-Revision-Date: 2009-07-18 15:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"

2
Languages/korean.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-25 17:16+0200\n" "POT-Creation-Date: 2009-07-26 19:54-0400\n"
"PO-Revision-Date: 2009-07-18 15:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"

2
Languages/norwegian.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-25 17:16+0200\n" "POT-Creation-Date: 2009-07-26 19:54-0400\n"
"PO-Revision-Date: 2009-07-18 15:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"

2
Languages/polish.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-25 17:16+0200\n" "POT-Creation-Date: 2009-07-26 19:54-0400\n"
"PO-Revision-Date: 2009-07-18 15:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n"
"Last-Translator: ziom666 (zadania_prog@vp.pl)\n" "Last-Translator: ziom666 (zadania_prog@vp.pl)\n"
"Language-Team: \n" "Language-Team: \n"

2
Languages/portuguese_br.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-25 17:16+0200\n" "POT-Creation-Date: 2009-07-26 19:54-0400\n"
"PO-Revision-Date: 2009-07-18 15:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"

2
Languages/portuguese_pt.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-25 17:16+0200\n" "POT-Creation-Date: 2009-07-26 19:54-0400\n"
"PO-Revision-Date: 2009-07-20 16:40\n" "PO-Revision-Date: 2009-07-20 16:40\n"
"Last-Translator: Sky8000\n" "Last-Translator: Sky8000\n"
"Language-Team: \n" "Language-Team: \n"

2
Languages/russian.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-25 17:16+0200\n" "POT-Creation-Date: 2009-07-26 19:54-0400\n"
"PO-Revision-Date: 2009-07-18 15:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n"
"Last-Translator: Kir\n" "Last-Translator: Kir\n"
"Language-Team: Kir\n" "Language-Team: Kir\n"

2
Languages/schinese.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-25 17:16+0200\n" "POT-Creation-Date: 2009-07-26 19:54-0400\n"
"PO-Revision-Date: 2009-07-18 15:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"

2
Languages/spanish.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-25 17:16+0200\n" "POT-Creation-Date: 2009-07-26 19:54-0400\n"
"PO-Revision-Date: 2009-07-18 15:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"

2
Languages/swedish.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-25 17:36+0200\n" "POT-Creation-Date: 2009-07-26 19:54-0400\n"
"PO-Revision-Date: 2009-07-24 16:45+0200\n" "PO-Revision-Date: 2009-07-24 16:45+0200\n"
"Last-Translator: Katsurou\n" "Last-Translator: Katsurou\n"
"Language-Team: Katsurou, pirateX\n" "Language-Team: Katsurou, pirateX\n"

2
Languages/tchinese.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-25 17:16+0200\n" "POT-Creation-Date: 2009-07-26 19:54-0400\n"
"PO-Revision-Date: 2009-07-18 15:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"

2
Languages/turkish.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-25 17:16+0200\n" "POT-Creation-Date: 2009-07-26 19:54-0400\n"
"PO-Revision-Date: 2009-07-18 15:18+0200\n" "PO-Revision-Date: 2009-07-18 15:18+0200\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"

4
source/cheats/cheatmenu.cpp
View File

@ -47,14 +47,14 @@ int CheatMenu(const char * gameID)
GuiText backBtnTxt(tr("Back") , 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); GuiText backBtnTxt(tr("Back") , 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255});
backBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30); backBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30);
GuiImage backBtnImg(&btnOutline); GuiImage backBtnImg(&btnOutline);
GuiButton backBtn(&backBtnImg,&backBtnImg, 2, 3, 160, 400, &trigA, &btnSoundOver, &btnClick,1); GuiButton backBtn(&backBtnImg,&backBtnImg, 2, 3, -140, 400, &trigA, &btnSoundOver, &btnClick,1);
backBtn.SetLabel(&backBtnTxt); backBtn.SetLabel(&backBtnTxt);
backBtn.SetTrigger(&trigB); backBtn.SetTrigger(&trigB);
GuiText createBtnTxt(tr("Create") , 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); GuiText createBtnTxt(tr("Create") , 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255});
createBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30); createBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30);
GuiImage createBtnImg(&btnOutline); GuiImage createBtnImg(&btnOutline);
GuiButton createBtn(&createBtnImg,&createBtnImg, 2, 3, -140, 400, &trigA, &btnSoundOver, &btnClick,1); GuiButton createBtn(&createBtnImg,&createBtnImg, 2, 3, 160, 400, &trigA, &btnSoundOver, &btnClick,1);
createBtn.SetLabel(&createBtnTxt); createBtn.SetLabel(&createBtnTxt);
char txtfilename[55]; char txtfilename[55];

2
source/network/networkops.cpp
View File

@ -16,7 +16,7 @@
#include "settings/cfg.h" #include "settings/cfg.h"
#include "main.h" #include "main.h"
#include "http.h" #include "http.h"
#include "svnrev.h" #include "../svnrev.h"
#define PORT 4299 #define PORT 4299

3
source/prompts/DiscBrowser.cpp
View File

@ -241,6 +241,7 @@ int autoSelectDol(const char *id)
if (strcmp(id,"RF8X69") == 0) return 464;//from isostar if (strcmp(id,"RF8X69") == 0) return 464;//from isostar
if (strcmp(id,"RZTP01") == 0) return 952;//from isostar if (strcmp(id,"RZTP01") == 0) return 952;//from isostar
if (strcmp(id,"RZTE01") == 0) return 674;//from starstremr
if (strcmp(id,"RMZX69") == 0) return 492;//from isostar if (strcmp(id,"RMZX69") == 0) return 492;//from isostar
if (strcmp(id,"RMZP69") == 0) return 492;//from isostar if (strcmp(id,"RMZP69") == 0) return 492;//from isostar
@ -302,6 +303,8 @@ Grand Slam R5TP69 1493
rboe69 = boogie ntsc = (675) rboe69 = boogie ntsc = (675)
RZTE01 = WSR = 674
Fifa08 RF8P69 463 Fifa08 RF8P69 463
Fifa08 RF8X69 464 Fifa08 RF8X69 464
Wii Sports Resort RZTP01 952 Wii Sports Resort RZTP01 952

100
source/prompts/TitleBrowser.cpp
View File

@ -12,6 +12,9 @@
#include "settings/cfg.h" #include "settings/cfg.h"
#include "sys.h" #include "sys.h"
#include "menu.h" #include "menu.h"
#include "audio.h"
#include "xml/xml.h"
#include "../wad/title.h" #include "../wad/title.h"
@ -36,6 +39,12 @@ int TitleBrowser(u32 type)
u32 titles[100] ATTRIBUTE_ALIGN(32); u32 titles[100] ATTRIBUTE_ALIGN(32);
s32 ret = -1; s32 ret = -1;
//open the database file
FILE *f;
char path[100];
sprintf(path,"%s/config/database.txt",bootDevice);
f = fopen(path, "r");
// Get count of titles of our requested type // Get count of titles of our requested type
ret = getTitles_TypeCount(type, &num_titles); ret = getTitles_TypeCount(type, &num_titles);
@ -61,22 +70,58 @@ int TitleBrowser(u32 type)
customOptionList options3(num_titles); customOptionList options3(num_titles);
//write the titles on the option browser //write the titles on the option browser
u32 i = 0; u32 i = 0;
while (i < num_titles){
char name[256];
while (i < num_titles){
//start from the beginning of the file each loop
rewind(f);
char name[50];
char text[15]; char text[15];
strcpy(name,"");//make sure name is empty
//set the title's name, number, ID to text //set the title's name, number, ID to text
sprintf(text, "%s", titleText(type, titles[i])); sprintf(text, "%s", titleText(type, titles[i]));
getTitle_Name(name, TITLE_ID(type, titles[i]), text); getTitle_Name(name, TITLE_ID(type, titles[i]), text);
//set the text to the option browser //get name from database cause i dont like the ADT function
options3.SetName(i, "%s",name); char line[200];
options3.SetValue(i, "%s (%08x)",text,titles[i]); char tmp[50];
snprintf(tmp,50,tmp," ");
snprintf(name,sizeof(name),"Unknown Title");
if (!f) {
sprintf(name,"Unknown--<No DB>");
}
else
{
while (fgets(line, sizeof(line), f)) {
if (line[0]== text[0]&&
line[1]== text[1]&&
line[2]== text[2])
{ int j=0;
for(j=0;(line[j+4]!='\0' || j<51);j++)
tmp[j]=line[j+4];
snprintf(name,sizeof(name),"%s",tmp);
break;
}
}
}
//set the text to the option browser
options3.SetName(i, "%s",text);
options3.SetValue(i, "%s",name);
//options3.SetValue(i, "%s (%08x)",text,titles[i]);
//move on to the next title //move on to the next title
i++; i++;
} }
bool exit = false; bool exit = false;
GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM, Settings.sfxvolume); GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM, Settings.sfxvolume);
@ -150,18 +195,58 @@ int TitleBrowser(u32 type)
ret = optionBrowser3.GetClickedOption(); ret = optionBrowser3.GetClickedOption();
if(ret > -1) {//if a click happened if(ret > -1) {//if a click happened
char name[256];
char text[15];
char name[50];
char text[15];
rewind(f);
strcpy(name,"");//make sure name is empty
//set the title's name, number, ID to text
sprintf(text, "%s", titleText(type, titles[ret])); sprintf(text, "%s", titleText(type, titles[ret]));
getTitle_Name(name, TITLE_ID(type, titles[ret]), text); getTitle_Name(name, TITLE_ID(type, titles[ret]), text);
//get name from database cause i dont like the ADT function
char line[200];
char tmp[50];
snprintf(tmp,50,tmp," ");
snprintf(name,sizeof(name),"Unknown Title");
if (!f) {
sprintf(name,"Unknown--<No DB>");
}
else
{
while (fgets(line, sizeof(line), f)) {
if (line[0]== text[0]&&
line[1]== text[1]&&
line[2]== text[2])
{ int j=0;
for(j=0;(line[j+4]!='\0' || j<51);j++)
tmp[j]=line[j+4];
snprintf(name,sizeof(name),"%s",tmp);
break;
}
}
}
char temp[100]; char temp[100];
//prompt to boot selected title //prompt to boot selected title
snprintf(temp, sizeof(temp), "%s : %s",text,name); snprintf(temp, sizeof(temp), "%s : %s",text,name);
int choice = WindowPrompt("Boot?", temp, tr("OK"), tr("Cancel")); int choice = WindowPrompt("Boot?", temp, tr("OK"), tr("Cancel"));
if(choice) {//if they say yes if(choice) {//if they say yes
//stop all this stuff before starting the channel
fclose(f);
CloseXMLDatabase();
ExitGUIThreads();
ShutdownAudio();
StopGX();
WII_Initialize(); WII_Initialize();
WII_LaunchTitle(TITLE_ID(type,titles[ret])); WII_LaunchTitle(TITLE_ID(type,titles[ret]));
//this really shouldn't be needed because the title will be booted //this really shouldn't be needed because the title will be booted
@ -183,6 +268,7 @@ int TitleBrowser(u32 type)
} }
} }
fclose(f);
HaltGui(); HaltGui();
mainWindow->Remove(&w); mainWindow->Remove(&w);
ResumeGui(); ResumeGui();

1134
source/settings/Settings.cpp
View File

File diff suppressed because it is too large Load Diff

6
source/settings/cfg.c
View File

@ -1745,8 +1745,10 @@ void CFG_Load(void)
//moved this to the HDD wait screen to avoid the garbled green screen while it is loading *maybe* //moved this to the HDD wait screen to avoid the garbled green screen while it is loading *maybe*
//OpenXMLDatabase(Settings.titlestxt_path, Settings.db_language, Settings.db_JPtoEN, true, Settings.titlesOverride==1?true:false, true); //OpenXMLDatabase(Settings.titlestxt_path, Settings.db_language, Settings.db_JPtoEN, true, Settings.titlesOverride==1?true:false, true);
// loaded after database to override database titles with custom titles // loaded after database to override database titles with custom titles
snprintf(pathname, sizeof(pathname), "%stitles.txt", Settings.titlestxt_path);
cfg_parsefile(pathname, &title_set); //took out this titles.txt shit because it is useless now. teh xml has all the titles in it
//snprintf(pathname, sizeof(pathname), "%stitles.txt", Settings.titlestxt_path);
//cfg_parsefile(pathname, &title_set);
// cfg_parsearg(argc, argv); // cfg_parsearg(argc, argv);
} }

2
source/svnrev.c
View File

@ -1,4 +1,4 @@
#define SVN_REV "649:652M" #define SVN_REV "653M"
const char *GetRev() const char *GetRev()
{ {