mirror of
https://github.com/wiidev/usbloadergx.git
synced 2024-11-08 04:25:07 +01:00
change the per game settings around a bit.
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:
parent
cc590e1ac8
commit
c6fd33eeb1
@ -4,7 +4,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: USB Loader GX\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"
|
||||
"Last-Translator: David Jelinek (djelinek@hotmail.com) \n"
|
||||
"Language-Team: Last version on http://startgolf.tym.cz/czech.lang \n"
|
||||
|
@ -4,7 +4,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: USB Loader GX\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"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
|
@ -4,7 +4,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: USB Loader GX\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"
|
||||
"Last-Translator: tj_cool\n"
|
||||
"Language-Team: \n"
|
||||
|
@ -4,7 +4,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: USB Loader GX\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"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
|
@ -4,7 +4,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: USB Loader GX\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"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
|
@ -4,7 +4,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: USB Loader GX\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"
|
||||
"Last-Translator: Kin8\n"
|
||||
"Language-Team: Badablek, Amour, ikya, OuahOuah, dj_skual & Kin8\n"
|
||||
|
@ -4,7 +4,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: USB Loader GX\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"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
|
@ -4,7 +4,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: USB Loader GX\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"
|
||||
"Last-Translator: Tusk\n"
|
||||
"Language-Team: \n"
|
||||
|
@ -4,7 +4,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: USB Loader GX\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"
|
||||
"Last-Translator: Cambo \n"
|
||||
"Language-Team: FoxeJoe & Cambo\n"
|
||||
|
@ -4,7 +4,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: USB Loader GX\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"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
|
@ -4,7 +4,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: USB Loader GX\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"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
|
@ -4,7 +4,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: USB Loader GX\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"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
|
@ -4,7 +4,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: USB Loader GX\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"
|
||||
"Last-Translator: ziom666 (zadania_prog@vp.pl)\n"
|
||||
"Language-Team: \n"
|
||||
|
@ -4,7 +4,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: USB Loader GX\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"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
|
@ -4,7 +4,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: USB Loader GX\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"
|
||||
"Last-Translator: Sky8000\n"
|
||||
"Language-Team: \n"
|
||||
|
@ -4,7 +4,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: USB Loader GX\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"
|
||||
"Last-Translator: Kir\n"
|
||||
"Language-Team: Kir\n"
|
||||
|
@ -4,7 +4,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: USB Loader GX\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"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
|
@ -4,7 +4,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: USB Loader GX\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"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
|
@ -4,7 +4,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: USB Loader GX\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"
|
||||
"Last-Translator: Katsurou\n"
|
||||
"Language-Team: Katsurou, pirateX\n"
|
||||
|
@ -4,7 +4,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: USB Loader GX\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"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
|
@ -4,7 +4,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: USB Loader GX\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"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
|
@ -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});
|
||||
backBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30);
|
||||
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.SetTrigger(&trigB);
|
||||
|
||||
GuiText createBtnTxt(tr("Create") , 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255});
|
||||
createBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30);
|
||||
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);
|
||||
|
||||
char txtfilename[55];
|
||||
|
@ -16,7 +16,7 @@
|
||||
#include "settings/cfg.h"
|
||||
#include "main.h"
|
||||
#include "http.h"
|
||||
#include "svnrev.h"
|
||||
#include "../svnrev.h"
|
||||
|
||||
#define PORT 4299
|
||||
|
||||
|
@ -241,6 +241,7 @@ int autoSelectDol(const char *id)
|
||||
if (strcmp(id,"RF8X69") == 0) return 464;//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,"RMZP69") == 0) return 492;//from isostar
|
||||
@ -301,6 +302,8 @@ Grand Slam R5TP69 1493
|
||||
Madden NFL08 RNFP69 1079
|
||||
|
||||
rboe69 = boogie ntsc = (675)
|
||||
|
||||
RZTE01 = WSR = 674
|
||||
|
||||
Fifa08 RF8P69 463
|
||||
Fifa08 RF8X69 464
|
||||
|
@ -12,6 +12,9 @@
|
||||
#include "settings/cfg.h"
|
||||
#include "sys.h"
|
||||
#include "menu.h"
|
||||
#include "audio.h"
|
||||
|
||||
#include "xml/xml.h"
|
||||
|
||||
#include "../wad/title.h"
|
||||
|
||||
@ -36,6 +39,12 @@ int TitleBrowser(u32 type)
|
||||
u32 titles[100] ATTRIBUTE_ALIGN(32);
|
||||
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
|
||||
ret = getTitles_TypeCount(type, &num_titles);
|
||||
@ -61,21 +70,57 @@ int TitleBrowser(u32 type)
|
||||
customOptionList options3(num_titles);
|
||||
//write the titles on the option browser
|
||||
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];
|
||||
strcpy(name,"");//make sure name is empty
|
||||
|
||||
//set the title's name, number, ID to text
|
||||
sprintf(text, "%s", titleText(type, titles[i]));
|
||||
getTitle_Name(name, TITLE_ID(type, titles[i]), 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;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
//set the text to the option browser
|
||||
options3.SetName(i, "%s",name);
|
||||
options3.SetValue(i, "%s (%08x)",text,titles[i]);
|
||||
|
||||
options3.SetName(i, "%s",text);
|
||||
options3.SetValue(i, "%s",name);
|
||||
//options3.SetValue(i, "%s (%08x)",text,titles[i]);
|
||||
//move on to the next title
|
||||
i++;
|
||||
}
|
||||
|
||||
|
||||
|
||||
bool exit = false;
|
||||
|
||||
@ -150,18 +195,58 @@ int TitleBrowser(u32 type)
|
||||
ret = optionBrowser3.GetClickedOption();
|
||||
|
||||
if(ret > -1) {//if a click happened
|
||||
char name[256];
|
||||
|
||||
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]));
|
||||
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];
|
||||
//prompt to boot selected title
|
||||
snprintf(temp, sizeof(temp), "%s : %s",text,name);
|
||||
int choice = WindowPrompt("Boot?", temp, tr("OK"), tr("Cancel"));
|
||||
if(choice) {//if they say yes
|
||||
|
||||
|
||||
//stop all this stuff before starting the channel
|
||||
fclose(f);
|
||||
CloseXMLDatabase();
|
||||
ExitGUIThreads();
|
||||
ShutdownAudio();
|
||||
StopGX();
|
||||
WII_Initialize();
|
||||
WII_LaunchTitle(TITLE_ID(type,titles[ret]));
|
||||
//this really shouldn't be needed because the title will be booted
|
||||
@ -182,7 +267,8 @@ int TitleBrowser(u32 type)
|
||||
ret = -10;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
fclose(f);
|
||||
HaltGui();
|
||||
mainWindow->Remove(&w);
|
||||
ResumeGui();
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -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*
|
||||
//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
|
||||
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);
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
#define SVN_REV "649:652M"
|
||||
#define SVN_REV "653M"
|
||||
|
||||
const char *GetRev()
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user