The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2024-11-23 19:59:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

- removed the ability to change the wii games directory and the gc games directory. may bring them back some day. Today it's standard for wii games to go in dev:/wbfs and gc games in dev:/games.

Browse Source 
- also changed all toogle's to toggle, the correct spelling.
This commit is contained in:
fledge68 2016-04-02 17:19:19 +00:00
parent 1541cb0a4a
commit 9dc3eaaad1
10 changed files with 402 additions and 402 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/banner/BannerWindow.cpp
View File

@ -113,7 +113,7 @@ void BannerWindow::CreateGCBanner(u8 *bnr, u8 *font1, u8 *font2, const wchar_t *
gameBanner.SetBannerText("T_GameTitle", title);
}
bool BannerWindow::ToogleZoom(void)
bool BannerWindow::ToggleZoom(void)
{
if(AnimZoom)
{
@ -220,9 +220,9 @@ void BannerWindow::Draw(void)
DrawRectangle(0.0f, 0.0f, m_vid.width(), m_vid.height(), (GXColor) {0, 0, 0, Brightness});
}
void BannerWindow::ToogleGameSettings()
void BannerWindow::ToggleGameSettings()
{
ToogleZoom();
ToggleZoom();
Brightness = (Brightness == 200 ? 0 : 200);
}

4
source/banner/BannerWindow.hpp
View File

@ -54,8 +54,8 @@ public:
bool GetInGameSettings() { return (Brightness == 200 ? true : false); }
void CreateGCBanner(u8 *bnr, u8 *font1, u8 *font2, const wchar_t *title);
void Draw(void);
bool ToogleZoom(void);
void ToogleGameSettings();
bool ToggleZoom(void);
void ToggleGameSettings();
bool GetShowBanner() { return ShowBanner; }
void SetShowBanner(bool show) { ShowBanner = show; }
void ReSetup_GX(void);

2
source/defines.h
View File

@ -7,7 +7,7 @@
#define STDEMU_DIR "/wiiflow/nandemu"
#define GAMES_DIR "%s:/wbfs"
#define HOMEBREW_DIR "%s:/apps"
#define DML_DIR "%s:/games"
#define GC_GAMES_DIR "%s:/games"
#define CFG_FILENAME "wiiflow_lite.ini"
#define LANG_FILENAME "languages.ini"
#define CAT_FILENAME "categories_lite.ini"

2
source/loader/gc_disc_dump.cpp
View File

@ -296,7 +296,7 @@ s32 GCDump::DumpGame()
memset(gamepath, 0, MAX_FAT_PATH);
char basedir[MAX_FAT_PATH];
memset(basedir, 0, MAX_FAT_PATH);
strncpy(basedir, fmt((strncmp(gamepartition, "sd", 2) != 0) ? usb_dml_game_dir : DML_DIR, gamepartition), MAX_FAT_PATH);
strncpy(basedir, fmt(GC_GAMES_DIR, gamepartition), MAX_FAT_PATH);
while(!gamedone)
{

6
source/loader/gc_disc_dump.hpp
View File

@ -69,7 +69,7 @@ struct FST
class GCDump
{
public:
void Init(bool skip, bool comp, bool wexf, bool align, u32 nretry, u32 rsize, const char* partition, const char* m_DMLgameDir)
void Init(bool skip, bool comp, bool wexf, bool align, u32 nretry, u32 rsize, const char* partition)
{
skiponerror = skip;
compressed = comp;
@ -78,7 +78,7 @@ public:
gc_nbrretry = nretry;
gc_readsize = rsize;
gamepartition = partition;
usb_dml_game_dir = m_DMLgameDir;
//gc_games_dir = m_gc_gamesDir;
gc_skipped = 0;
waitonerror = true;
}
@ -95,7 +95,7 @@ private:
bool gamedone;
bool multigamedisc;
const char *gamepartition;
const char *usb_dml_game_dir;
//const char *gc_games_dir;
char minfo[74];
u8 Disc;
u8 Disc2;

3
source/menu/menu.cpp
View File

@ -254,7 +254,6 @@ void CMenu::init()
MIOSisDML();
if(m_show_dml == false)
m_show_dml = (m_mios_ver > 0);
m_DMLgameDir = fmt("%%s:/%s", m_cfg.getString(GC_DOMAIN, "dir_usb_games", "games").c_str());
/* Emu NAND */
m_cfg.getString(CHANNEL_DOMAIN, "path", "");
m_cfg.getInt(CHANNEL_DOMAIN, "partition", 1);
@ -2257,7 +2256,7 @@ bool CMenu::_loadDmlList()
return false;
m_gameList.clear();
string gameDir(fmt(currentPartition == SD ? DML_DIR : m_DMLgameDir.c_str(), DeviceName[currentPartition]));
string gameDir(fmt(GC_GAMES_DIR, DeviceName[currentPartition]));
string cacheDir(fmt("%s/%s_gamecube.db", m_listCacheDir.c_str(), DeviceName[currentPartition]));
bool updateCache = m_cfg.getBool(GC_DOMAIN, "update_cache");
m_gameList.CreateList(COVERFLOW_GAMECUBE, currentPartition, gameDir,

1
source/menu/menu.hpp
View File

@ -124,7 +124,6 @@ private:
string m_screenshotDir;
string m_settingsDir;
string m_languagesDir;
string m_DMLgameDir;
string m_helpDir;
/* Explorer stuff */

48
source/menu/menu_game.cpp
View File

@ -43,8 +43,8 @@ extern const u32 gc_ogg_size;
bool m_zoom_banner = false;
s16 m_gameBtnPlayFull;
s16 m_gameBtnBackFull;
s16 m_gameBtnToogle;
s16 m_gameBtnToogleFull;
s16 m_gameBtnToggle;
s16 m_gameBtnToggleFull;
const CMenu::SOption CMenu::_languages[11] = {
{ "lngdef", L"Default" },
@ -304,8 +304,8 @@ void CMenu::_hideGame(bool instant)
m_btnMgr.hide(m_gameBtnBackFull, instant);
m_btnMgr.hide(m_gameBtnDelete, instant);
m_btnMgr.hide(m_gameBtnSettings, instant);
m_btnMgr.hide(m_gameBtnToogle, instant);
m_btnMgr.hide(m_gameBtnToogleFull, instant);
m_btnMgr.hide(m_gameBtnToggle, instant);
m_btnMgr.hide(m_gameBtnToggleFull, instant);
m_btnMgr.hide(m_gameBtnFavoriteOn, instant);
m_btnMgr.hide(m_gameBtnFavoriteOff, instant);
@ -342,13 +342,13 @@ void CMenu::_showGame(void)
}
m_btnMgr.show(m_gameBtnPlay);
m_btnMgr.show(m_gameBtnBack);
m_btnMgr.show(m_gameBtnToogle);
m_btnMgr.show(m_gameBtnToggle);
}
else
{
m_btnMgr.show(m_gameBtnPlayFull);
m_btnMgr.show(m_gameBtnBackFull);
m_btnMgr.show(m_gameBtnToogleFull);
m_btnMgr.show(m_gameBtnToggleFull);
}
}
@ -453,7 +453,7 @@ void CMenu::_game(bool launch)
}
currentMoviePos = (m_zoom_banner ? zoomedMoviePos : normalMoviePos);
if(m_banner.GetZoomSetting() != m_zoom_banner)
m_banner.ToogleZoom();
m_banner.ToggleZoom();
if(!launch)
{
@ -559,25 +559,25 @@ void CMenu::_game(bool launch)
_cleanupBanner();
break;
}
else if((m_btnMgr.selected(m_gameBtnToogle) || m_btnMgr.selected(m_gameBtnToogleFull))
else if((m_btnMgr.selected(m_gameBtnToggle) || m_btnMgr.selected(m_gameBtnToggleFull))
&& (!NoGameID(CoverFlow.getHdr()->type) || m_video_playing))
{
m_zoom_banner = m_banner.ToogleZoom();
m_zoom_banner = m_banner.ToggleZoom();
m_cfg.setBool(_domainFromView(), "show_full_banner", m_zoom_banner);
currentMoviePos = (m_zoom_banner ? zoomedMoviePos : normalMoviePos);
m_show_zone_game = false;
m_btnMgr.hide(m_gameBtnPlayFull);
m_btnMgr.hide(m_gameBtnBackFull);
m_btnMgr.hide(m_gameBtnToogleFull);
m_btnMgr.hide(m_gameBtnToggleFull);
}
else if(m_btnMgr.selected(m_gameBtnSettings) && (CoverFlow.getHdr()->type == TYPE_WII_GAME || CoverFlow.getHdr()->type == TYPE_GC_GAME || CoverFlow.getHdr()->type == TYPE_CHANNEL))
{
_hideGame();
m_gameSelected = true;
m_banner.ToogleGameSettings();
m_banner.ToggleGameSettings();
_gameSettings();
m_banner.ToogleGameSettings();
m_banner.ToggleGameSettings();
_showGame();
if(!m_gameSound.IsPlaying())
@ -700,12 +700,12 @@ void CMenu::_game(bool launch)
m_btnMgr.show(m_gameBtnPlay);
m_btnMgr.show(m_gameBtnBack);
if(!m_fa.isLoaded())
m_btnMgr.show(m_gameBtnToogle);
m_btnMgr.show(m_gameBtnToggle);
else
m_btnMgr.hide(m_gameBtnToogle);
m_btnMgr.hide(m_gameBtnToggle);
m_btnMgr.hide(m_gameBtnPlayFull);
m_btnMgr.hide(m_gameBtnBackFull);
m_btnMgr.hide(m_gameBtnToogleFull);
m_btnMgr.hide(m_gameBtnToggleFull);
if(m_gameLblUser[4] != -1 && !NoGameID(CoverFlow.getHdr()->type) && !m_fa.isLoaded())
m_btnMgr.show(m_gameLblUser[4]);
else
@ -732,7 +732,7 @@ void CMenu::_game(bool launch)
{
m_btnMgr.show(m_gameBtnPlayFull);
m_btnMgr.show(m_gameBtnBackFull);
m_btnMgr.show(m_gameBtnToogleFull);
m_btnMgr.show(m_gameBtnToggleFull);
}
m_btnMgr.hide(m_gameBtnFavoriteOn);
m_btnMgr.hide(m_gameBtnFavoriteOff);
@ -742,7 +742,7 @@ void CMenu::_game(bool launch)
m_btnMgr.hide(m_gameBtnDelete);
m_btnMgr.hide(m_gameBtnPlay);
m_btnMgr.hide(m_gameBtnBack);
m_btnMgr.hide(m_gameBtnToogle);
m_btnMgr.hide(m_gameBtnToggle);
if(m_gameLblUser[4] != -1)
{
if(!NoGameID(CoverFlow.getHdr()->type) && !m_zoom_banner && !m_fa.isLoaded())
@ -1002,7 +1002,7 @@ void CMenu::_launchGC(dir_discHdr *hdr, bool disc)
{
bool foundOnSD = false;
ListGenerator SD_List;
string gameDir(fmt(DML_DIR, DeviceName[SD]));
string gameDir(fmt(GC_GAMES_DIR, DeviceName[SD]));
string cacheDir(fmt("%s/%s_gamecube.db", m_listCacheDir.c_str(), DeviceName[SD]));
SD_List.CreateList(COVERFLOW_GAMECUBE, SD, gameDir,
stringToVector(".iso|root", '|'), cacheDir, false);
@ -1030,7 +1030,7 @@ void CMenu::_launchGC(dir_discHdr *hdr, bool disc)
u32 Place = GC_Path.find_last_of("/");
GC_Path = hdr->path;
memset(hdr->path, 0, sizeof(hdr->path));
snprintf(folder, sizeof(folder), DML_DIR, DeviceName[SD]);
snprintf(folder, sizeof(folder), GC_GAMES_DIR, DeviceName[SD]);
snprintf(hdr->path, sizeof(hdr->path), "%s/%s", folder, &GC_Path[Place]+1);
}
else
@ -1675,8 +1675,8 @@ void CMenu::_initGameMenu()
m_gameBtnDelete = _addPicButton("GAME/DELETE_BTN", texDelete, texDeleteSel, 532, 272, 48, 48);
m_gameBtnBackFull = _addButton("GAME/BACK_FULL_BTN", theme.btnFont, L"", 100, 390, 200, 56, theme.btnFontColor);
m_gameBtnPlayFull = _addButton("GAME/PLAY_FULL_BTN", theme.btnFont, L"", 340, 390, 200, 56, theme.btnFontColor);
m_gameBtnToogle = _addPicButton("GAME/TOOGLE_BTN", texToggleBanner, texToggleBanner, 385, 31, 236, 127);
m_gameBtnToogleFull = _addPicButton("GAME/TOOGLE_FULL_BTN", texToggleBanner, texToggleBanner, 20, 12, 608, 344);
m_gameBtnToggle = _addPicButton("GAME/TOOGLE_BTN", texToggleBanner, texToggleBanner, 385, 31, 236, 127);
m_gameBtnToggleFull = _addPicButton("GAME/TOOGLE_FULL_BTN", texToggleBanner, texToggleBanner, 20, 12, 608, 344);
m_gameButtonsZone.x = m_theme.getInt("GAME/ZONES", "buttons_x", 0);
m_gameButtonsZone.y = m_theme.getInt("GAME/ZONES", "buttons_y", 0);
@ -1694,8 +1694,8 @@ void CMenu::_initGameMenu()
_setHideAnim(m_gameBtnDelete, "GAME/DELETE_BTN", 0, 0, 1.f, -1.f);
_setHideAnim(m_gameBtnPlayFull, "GAME/PLAY_FULL_BTN", 0, 0, 1.f, 0.f);
_setHideAnim(m_gameBtnBackFull, "GAME/BACK_FULL_BTN", 0, 0, 1.f, 0.f);
_setHideAnim(m_gameBtnToogle, "GAME/TOOGLE_BTN", 200, 0, 1.f, 0.f);
_setHideAnim(m_gameBtnToogleFull, "GAME/TOOGLE_FULL_BTN", 200, 0, 1.f, 0.f);
_setHideAnim(m_gameBtnToggle, "GAME/TOOGLE_BTN", 200, 0, 1.f, 0.f);
_setHideAnim(m_gameBtnToggleFull, "GAME/TOOGLE_FULL_BTN", 200, 0, 1.f, 0.f);
_hideGame(true);
_textGame();
}
@ -1860,7 +1860,7 @@ void CMenu::_playGameSound(void)
return;
if(m_zoom_banner == true)
{
m_zoom_banner = m_banner.ToogleZoom();
m_zoom_banner = m_banner.ToggleZoom();
m_cfg.setBool(_domainFromView(), "show_full_banner", m_zoom_banner);
currentMoviePos = normalMoviePos;
}

14
source/menu/menu_paths.cpp
View File

@ -171,7 +171,7 @@ void CMenu::_Paths(void)
}
else if (BTN_A_PRESSED && paths_curPage == 2)
{
if (m_btnMgr.selected(m_pathsBtn1))
/*if (m_btnMgr.selected(m_pathsBtn1))
{
_hidePaths();
currentPartition = m_cfg.getInt(WII_DOMAIN, "partition", USB1);
@ -202,9 +202,10 @@ void CMenu::_Paths(void)
{
_hidePaths();
currentPartition = m_cfg.getInt(GC_DOMAIN, "partition", USB1);
string gameDir(fmt(currentPartition == SD ? DML_DIR : m_DMLgameDir.c_str(), DeviceName[currentPartition]));
string gameDir(fmt(m_usb_gc_gamesDir.c_str(), DeviceName[currentPartition]));
path = _FolderExplorer(gameDir.c_str());
if(strlen(path) > 0)
//can only change usb1 folder name.
if(strlen(path) > 0 && (strncmp(path, "usb1:/", 6) == 0))
{
if(strncmp(path, "sd:/", 4) == 0)
m_cfg.setInt(GC_DOMAIN, "partition", 0);
@ -216,14 +217,15 @@ void CMenu::_Paths(void)
char tmpPath[MAX_FAT_PATH];
strncpy(tmpPath, strchr(path, '/')+1, MAX_FAT_PATH-1);
m_cfg.setString(GC_DOMAIN, "dir_usb_games", tmpPath);
m_DMLgameDir = fmt("%%s:/%s", m_cfg.getString(GC_DOMAIN, "dir_usb_games", "games").c_str());
m_usb_gc_gamesDir = fmt("%%s:/%s", tmpPath);
//m_usb_gc_gamesDir = fmt("%%s:/%s", m_cfg.getString(GC_DOMAIN, "dir_usb_games", "games").c_str());
m_cfg.setBool(GC_DOMAIN, "update_cache", true);
if(m_cfg.getBool(GC_DOMAIN, "source"))
m_load_view = true;
}
_showPaths();
}
else if (m_btnMgr.selected(m_pathsBtn3))
}*/
if (m_btnMgr.selected(m_pathsBtn3))
{
_hidePaths();
path = _FolderExplorer(m_cfg.getString("GENERAL", "dir_music").c_str());

6
source/menu/menu_wbfs.cpp
View File

@ -170,7 +170,7 @@ int CMenu::_GCgameInstaller()
if(skip)
rsize = 8192; // Use small chunks when skip on error is enabled
m_gcdump.Init(skip, comp, wexf, alig, nretry, rsize, DeviceName[currentPartition], m_DMLgameDir.c_str());
m_gcdump.Init(skip, comp, wexf, alig, nretry, rsize, DeviceName[currentPartition]);
int ret;
m_progress = 0.f;
@ -235,7 +235,7 @@ int CMenu::_GCcopyGame(void *obj)
source[299] = '\0';
char folder[50];
strncpy(folder, fmt(DML_DIR, DeviceName[SD]), sizeof(folder));
strncpy(folder, fmt(GC_GAMES_DIR, DeviceName[SD]), sizeof(folder));
folder[49] = '\0';
char target[300];
@ -396,7 +396,7 @@ bool CMenu::_wbfsOp(CMenu::WBFS_OP op)
{
strncpy(GC_Path, CF_Hdr->path, 1023);
*strrchr(GC_Path, '/') = '\0'; //iso path
const char *cmp = fmt(currentPartition == SD ? DML_DIR : m_DMLgameDir.c_str(), DeviceName[currentPartition]);
const char *cmp = fmt(GC_GAMES_DIR, DeviceName[currentPartition]);
if(strcasecmp(GC_Path, cmp) == 0)
fsop_deleteFile(CF_Hdr->path);
else