The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2024-11-27 13:44:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

-sync with wiiflow r418

Browse Source
This commit is contained in:
fix94.1 2012-02-01 22:26:51 +00:00
parent 880c9b7145
commit 468f678ac2
11 changed files with 102 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/dvdskin(original).png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.5 KiB

7
source/defines.h
View File

@ -1,5 +1,5 @@
#define APP_NAME "WiiFlow" #define APP_NAME "WiiFlow"
#define APP_VERSION "3.0 ALPHA" #define APP_VERSION "3.1 Alpha"
#define APPDATA_DIR "wiiflow" #define APPDATA_DIR "wiiflow"
#define APPDATA_DIR2 "apps/wiiflow" #define APPDATA_DIR2 "apps/wiiflow"
@ -22,8 +22,9 @@
"Lustar, CedWii, Benjay, Domi78, Oops, Celtiore, Jiiwah, FluffyKiwi, Roku93, \ "Lustar, CedWii, Benjay, Domi78, Oops, Celtiore, Jiiwah, FluffyKiwi, Roku93, \
Spayrosam, Bluescreen81, Chappy23, BlindDude, Bubba, DJTaz, OggZee, Usptactical, \ Spayrosam, Bluescreen81, Chappy23, BlindDude, Bubba, DJTaz, OggZee, Usptactical, \
WiiPower, Hermes, Spidy1000, Dimok, Kovani, Drexyl, DvZ, Etheboss, FIX94, GaiaKnight, \ WiiPower, Hermes, Spidy1000, Dimok, Kovani, Drexyl, DvZ, Etheboss, FIX94, GaiaKnight, \
nibb, NJ7, Plasma, Pakatus, ravmn, spidercaleb, Ziggy34, And to anyone who has donated or contributed to Wiiflow \ nibb, NJ7, Plasma, Pakatus, ravmn, spidercaleb, Ziggy34 \
\nthat we missed!" And to anyone who has donated or contributed to Wiiflow \
that we missed!"
#define THANKS_SITES "devkitpro.org, wiibrew.org, gametdb.com, ohloh.net, wiifanart.com, wiiflowiki.com, tgames.fr.nf" #define THANKS_SITES "devkitpro.org, wiibrew.org, gametdb.com, ohloh.net, wiifanart.com, wiiflowiki.com, tgames.fr.nf"
#define THANKS_CODE "CFG Loader, uLoader, USB Loader GX, NeoGamma, WiiXplorer, Triiforce, Mighty Channels" #define THANKS_CODE "CFG Loader, uLoader, USB Loader GX, NeoGamma, WiiXplorer, Triiforce, Mighty Channels"

2
source/list/cachedlist.cpp
View File

@ -102,7 +102,7 @@ void CachedList<dir_discHdr>::LoadChannels(string path, u32 channelType)
if(m_update) if(m_update)
{ {
gprintf("Updating\n"); gprintf("Updating channels\n");
list.GetChannels(*this, m_settingsDir, channelType, m_channelLang); list.GetChannels(*this, m_settingsDir, channelType, m_channelLang);
m_loaded = true; m_loaded = true;

3
source/menu/menu.hpp
View File

@ -166,6 +166,7 @@ private:
u32 m_mainLblInit; u32 m_mainLblInit;
u32 m_mainLblUser[6]; u32 m_mainLblUser[6];
bool m_show_dml; bool m_show_dml;
bool m_GameTDBLoaded;
//Main Config menus //Main Config menus
u32 m_configLblPage; u32 m_configLblPage;
u32 m_configBtnPageM; u32 m_configBtnPageM;
@ -700,7 +701,7 @@ private:
int _config4(void); int _config4(void);
int _configAdv(void); int _configAdv(void);
int _configSnd(void); int _configSnd(void);
void _game(bool launch = false, bool gametdb = false); void _game(bool launch = false);
void _download(std::string gameId = std::string()); void _download(std::string gameId = std::string());
bool _code(char code[4], bool erase = false); bool _code(char code[4], bool erase = false);
void _about(void); void _about(void);

5
source/menu/menu_download.cpp
View File

@ -119,8 +119,9 @@ static string countryCode(const string &gameId)
static string makeURL(const string format, const string gameId, const string country) static string makeURL(const string format, const string gameId, const string country)
{ {
string url = format; string url = format;
if (url.find(TAG_LOC) != url.npos) //check if {loc} is in the URL before trying to replace it if (url.find(TAG_LOC) != url.npos)
url.replace(url.find(TAG_LOC), strlen(TAG_LOC), country.c_str()); url.replace(url.find(TAG_LOC), strlen(TAG_LOC), country.c_str());
url.replace(url.find(TAG_GAME_ID), strlen(TAG_GAME_ID), gameId.c_str()); url.replace(url.find(TAG_GAME_ID), strlen(TAG_GAME_ID), gameId.c_str());
return url; return url;

4
source/menu/menu_game.cpp
View File

@ -284,7 +284,7 @@ static void setLanguage(int l)
configbytes[0] = 0xCD; configbytes[0] = 0xCD;
} }
void CMenu::_game(bool launch, bool gametdb) void CMenu::_game(bool launch)
{ {
m_gcfg1.load(sfmt("%s/gameconfig1.ini", m_settingsDir.c_str()).c_str()); m_gcfg1.load(sfmt("%s/gameconfig1.ini", m_settingsDir.c_str()).c_str());
if (!launch) if (!launch)
@ -321,7 +321,7 @@ void CMenu::_game(bool launch, bool gametdb)
m_gameSound.Stop(); m_gameSound.Stop();
break; break;
} }
else if (BTN_PLUS_PRESSED && gametdb) else if (BTN_PLUS_PRESSED && m_GameTDBLoaded)
{ {
_hideGame(); _hideGame();
m_gameSelected = true; m_gameSelected = true;

39
source/menu/menu_main.cpp
View File

@ -74,31 +74,17 @@ void CMenu::_hideMain(bool instant)
} }
static bool show_homebrew = true; static bool show_homebrew = true;
static bool show_channel = true;
static bool parental_homebrew = false; static bool parental_homebrew = false;
static bool show_channel = true;
void CMenu::_showMain(void) void CMenu::_showMain(void)
{ {
_hideWaitMessage(); _hideWaitMessage();
#ifdef SHOWMEM #ifdef SHOWMEM
m_btnMgr.show(m_mem2FreeSize); m_btnMgr.show(m_mem2FreeSize);
#endif
#ifdef SHOWMEMGECKO
mem1 = SYS_GetArena1Size();
mem2 = MEM2_freesize();
if( mem1 != mem1old )
{
mem1old = mem1;
gprintf("Mem1 Free: %u\n", mem1);
}
if( mem2 != mem2old )
{
mem2old = mem2;
gprintf("Mem2 Free: %u\n", mem2);
}
#endif #endif
m_vid.set2DViewport(m_cfg.getInt("GENERAL", "tv_width", 640), m_cfg.getInt("GENERAL", "tv_height", 480), m_vid.set2DViewport(m_cfg.getInt("GENERAL", "tv_width", 640), m_cfg.getInt("GENERAL", "tv_height", 480),
m_cfg.getInt("GENERAL", "tv_x", 0), m_cfg.getInt("GENERAL", "tv_y", 0)); m_cfg.getInt("GENERAL", "tv_x", 0), m_cfg.getInt("GENERAL", "tv_y", 0));
_setBg(m_gameBg, m_gameBgLQ); _setBg(m_gameBg, m_gameBgLQ);
m_btnMgr.show(m_mainBtnInfo); m_btnMgr.show(m_mainBtnInfo);
m_btnMgr.show(m_mainBtnConfig); m_btnMgr.show(m_mainBtnConfig);
@ -169,7 +155,8 @@ void CMenu::LoadView(void)
_loadCFLayout(m_cfg.getInt(_domainFromView(), "last_cf_mode", 1)); _loadCFLayout(m_cfg.getInt(_domainFromView(), "last_cf_mode", 1));
m_cf.applySettings(); m_cf.applySettings();
char *mode = (m_current_view == COVERFLOW_CHANNEL && m_cfg.getBool("NAND", "disable", true)) ? (char *)"NAND" : ((m_current_view == COVERFLOW_DML) ? (char *)"DML" : (char *)DeviceName[currentPartition]); char *mode = (m_current_view == COVERFLOW_CHANNEL && m_cfg.getBool("NAND", "disable", true))
? (char *)"NAND" : ((m_current_view == COVERFLOW_DML) ? (char *)"DML" : (char *)DeviceName[currentPartition]);
for(u8 i = 0; strncmp((const char *)&mode[i], "\0", 1) != 0; i++) for(u8 i = 0; strncmp((const char *)&mode[i], "\0", 1) != 0; i++)
mode[i] = toupper(mode[i]); mode[i] = toupper(mode[i]);
@ -184,8 +171,8 @@ int CMenu::main(void)
wstringEx curLetter; wstringEx curLetter;
string prevTheme = m_cfg.getString("GENERAL", "theme", "default"); string prevTheme = m_cfg.getString("GENERAL", "theme", "default");
bool use_grab = m_cfg.getBool("GENERAL", "use_grab", false); bool use_grab = m_cfg.getBool("GENERAL", "use_grab", false);
show_channel = !m_cfg.getBool("GENERAL", "hidechannel", false);
show_homebrew = !m_cfg.getBool("HOMEBREW", "disable", false); show_homebrew = !m_cfg.getBool("HOMEBREW", "disable", false);
show_channel = !m_cfg.getBool("GENERAL", "hidechannel", false);
parental_homebrew = m_cfg.getBool("HOMEBREW", "parental", false); parental_homebrew = m_cfg.getBool("HOMEBREW", "parental", false);
m_reload = false; m_reload = false;
@ -197,12 +184,16 @@ int CMenu::main(void)
SetupInput(); SetupInput();
MusicPlayer::Instance()->Play(); MusicPlayer::Instance()->Play();
GameTDB m_gametdb; GameTDB m_gametdb;
m_gametdb.OpenFile(sfmt("%s/wiitdb.xml", m_settingsDir.c_str()).c_str()); m_gametdb.OpenFile(sfmt("%s/wiitdb.xml", m_settingsDir.c_str()).c_str());
bool gametdbloaded=false; m_GameTDBLoaded=false;
if (m_gametdb.IsLoaded()) if( m_gametdb.IsLoaded() )
gametdbloaded=true; {
m_gametdb.CloseFile(); m_GameTDBLoaded=true;
m_gametdb.CloseFile();
}
m_gameList.SetLanguage(m_loc.getString(m_curLanguage, "gametdb_code", "EN").c_str()); m_gameList.SetLanguage(m_loc.getString(m_curLanguage, "gametdb_code", "EN").c_str());
if (m_cfg.getBool("GENERAL", "update_cache", false)) if (m_cfg.getBool("GENERAL", "update_cache", false))
{ {
@ -592,7 +583,7 @@ int CMenu::main(void)
if (m_cf.select()) if (m_cf.select())
{ {
_hideMain(); _hideMain();
_game(BTN_B_HELD, gametdbloaded); _game(BTN_B_HELD);
if(m_exit) break; if(m_exit) break;
m_cf.cancel(); m_cf.cancel();
_showMain(); _showMain();

2
wiiflow.pnproj
View File

File diff suppressed because one or more lines are too long

2
wiiflow.pnps
View File

@ -1 +1 @@
<pd><ViewState><e p="Wiiflow\portlibs" x="false"></e><e p="Wiiflow\source\cheats" x="true"></e><e p="Wiiflow\data\images" x="false"></e><e p="Wiiflow\docs" x="false"></e><e p="Wiiflow\source\gecko" x="false"></e><e p="Wiiflow\source\homebrew" x="true"></e><e p="Wiiflow\source\loader" x="false"></e><e p="Wiiflow\resources\app_booter" x="true"></e><e p="Wiiflow\source\wstringEx" x="false"></e><e p="Wiiflow\source\gc" x="true"></e><e p="Wiiflow\source\list" x="false"></e><e p="Wiiflow\source\music" x="false"></e><e p="Wiiflow\source\config" x="true"></e><e p="Wiiflow\source\memory" x="true"></e><e p="Wiiflow\source" x="true"></e><e p="Wiiflow\source\channel" x="true"></e><e p="Wiiflow\source\menu" x="true"></e><e p="Wiiflow\source\network" x="false"></e><e p="Wiiflow\source\unzip" x="false"></e><e p="Wiiflow\wii" x="true"></e><e p="Wiiflow\wii\docs" x="false"></e><e p="Wiiflow\data" x="true"></e><e p="Wiiflow\resources" x="true"></e><e p="Wiiflow\resources\app_booter\source" x="false"></e><e p="Wiiflow\scripts" x="false"></e><e p="Wiiflow\source\devicemounter" x="true"></e><e p="Wiiflow\source\gui" x="true"></e><e p="Wiiflow" x="true"></e><e p="Wiiflow\data\sounds" x="false"></e><e p="Wiiflow\source\devicemounter\libwbfs" x="false"></e><e p="Wiiflow\wii\apps" x="false"></e><e p="Wiiflow\wii\wiiflow" x="false"></e></ViewState></pd> <pd><ViewState><e p="Wiiflow\data" x="false"></e><e p="Wiiflow\portlibs" x="false"></e><e p="Wiiflow\resources" x="false"></e><e p="Wiiflow\scripts" x="false"></e><e p="Wiiflow" x="true"></e><e p="Wiiflow\docs" x="false"></e><e p="Wiiflow\source" x="false"></e><e p="Wiiflow\wii" x="false"></e></ViewState></pd>