From 7bf04b023d22978ead69240ca60eefbea42d1139 Mon Sep 17 00:00:00 2001 From: Fledge68 Date: Mon, 29 Apr 2019 08:14:54 -0500 Subject: [PATCH] - set wiiflow to default to using cIOS. if you want to use IOS58 go to startup settings and set force load cios to 'no'. - #92 doubled the length of char wfcTitle[] to 128 for long plugin rom titles. fixes possible rom covers not showing do to their title being longer than 64. - #93 added .gcm as a extension for gamecube ISO's. - fixed hiding homebrew icon via homebrew settings option. --- source/channel/nand_save.cpp | 4 ++++ source/gui/coverflow.cpp | 4 ++-- source/main.cpp | 6 +++--- source/menu/menu.cpp | 2 +- source/menu/menu_boot.cpp | 2 +- source/menu/menu_gameinfo.cpp | 2 ++ source/menu/menu_main.cpp | 2 ++ 7 files changed, 15 insertions(+), 7 deletions(-) diff --git a/source/channel/nand_save.cpp b/source/channel/nand_save.cpp index 445500c4..f0fe6e0b 100644 --- a/source/channel/nand_save.cpp +++ b/source/channel/nand_save.cpp @@ -43,6 +43,10 @@ NandSave::NandSave() loaded = false; } +/* checks for wiiflow save WFSF by searching for the banner.bin. if found then wiiflow save found. */ +/* if not found then we use save.bin to create banner.bin, tik.bin, and tmd.bin which are compressed into save.bin. */ +/* the IOS and port settings are only created if they are changed in startup settings menu. */ +/* also the ticket and its folder are deleted after the tmd is created. */ bool NandSave::CheckSave() { /* 10 million variables */ diff --git a/source/gui/coverflow.cpp b/source/gui/coverflow.cpp index 5d1d0629..54116b12 100644 --- a/source/gui/coverflow.cpp +++ b/source/gui/coverflow.cpp @@ -2842,8 +2842,8 @@ CCoverFlow::CLRet CCoverFlow::_loadCoverTex(u32 i, bool box, bool hq, bool blank /* try to find the wfc texture file in the cache folder */ if(!m_cachePath.empty()) { - char wfcTitle[64]; - wfcTitle[63] = '\0'; + char wfcTitle[128]; + wfcTitle[127] = '\0'; const char *wfcCoverDir = NULL; char *full_path = (char*)MEM2_alloc(MAX_FAT_PATH+1); if(full_path == NULL) diff --git a/source/main.cpp b/source/main.cpp index 8e604332..e794774d 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -23,7 +23,7 @@ #include "memory/memory.h" bool isWiiVC = false; -bool useMainIOS = false; +bool useMainIOS = true; volatile bool NANDemuView = false; volatile bool networkInit = false; @@ -167,9 +167,9 @@ int main(int argc, char **argv) /* Handle (c)IOS Loading */ if(useMainIOS && CustomIOS(IOS_GetType(mainIOS))) /* Requested */ - iosOK = loadIOS(mainIOS, false) && CustomIOS(CurrentIOS.Type); + iosOK = loadIOS(mainIOS, false) && CustomIOS(CurrentIOS.Type);// reload to cIOS (249 by default) else - gprintf("Using IOS58\n"); + gprintf("Using IOS58\n");// stay on IOS58. no reload to cIOS } /* sys inits */ diff --git a/source/menu/menu.cpp b/source/menu/menu.cpp index 96656bb1..e6d9092d 100644 --- a/source/menu/menu.cpp +++ b/source/menu/menu.cpp @@ -2328,7 +2328,7 @@ bool CMenu::_loadGamecubeList() bool updateCache = m_cfg.getBool(GC_DOMAIN, "update_cache"); if(updateCache || !fsop_FileExist(cacheDir.c_str())) cacheCovers = true; - m_cacheList.CreateList(COVERFLOW_GAMECUBE, currentPartition, gameDir, stringToVector(".iso|.ciso|root", '|'), cacheDir, updateCache); + m_cacheList.CreateList(COVERFLOW_GAMECUBE, currentPartition, gameDir, stringToVector(".iso|.gcm|.ciso|root", '|'), cacheDir, updateCache); m_cfg.remove(GC_DOMAIN, "update_cache"); for(vector::iterator tmp_itr = m_cacheList.begin(); tmp_itr != m_cacheList.end(); tmp_itr++) m_gameList.push_back(*tmp_itr); diff --git a/source/menu/menu_boot.cpp b/source/menu/menu_boot.cpp index 00789e59..7b1b0e32 100644 --- a/source/menu/menu_boot.cpp +++ b/source/menu/menu_boot.cpp @@ -58,7 +58,7 @@ void CMenu::_showBoot() if(cur_ios > 0) m_btnMgr.setText(m_bootLblCurCIOSrev, wfmt(L"%i", cur_ios)); else - m_btnMgr.setText(m_bootLblCurCIOSrev, L"AUTO"); + m_btnMgr.setText(m_bootLblCurCIOSrev, L"AUTO");// cIOS 249 unless the user changed it via the meta.xml m_btnMgr.show(m_bootLblLoadCIOS); m_btnMgr.show(m_bootBtnLoadCIOS); diff --git a/source/menu/menu_gameinfo.cpp b/source/menu/menu_gameinfo.cpp index 005e6875..deb2f2c1 100644 --- a/source/menu/menu_gameinfo.cpp +++ b/source/menu/menu_gameinfo.cpp @@ -360,6 +360,8 @@ void CMenu::_textGameInfo(void) return;// no platform name found to match plugin magic # /* check COMBINED for database platform name */ + /* some platforms have different names per country (ex. Genesis/Megadrive) */ + /* but we use only one platform name for both */ string newName = m_platform.getString("COMBINED", platformName); if(newName.empty()) m_platform.remove("COMBINED", platformName); diff --git a/source/menu/menu_main.cpp b/source/menu/menu_main.cpp index c7d73685..ceab51ce 100644 --- a/source/menu/menu_main.cpp +++ b/source/menu/menu_main.cpp @@ -131,6 +131,7 @@ void CMenu::_showCF(bool refreshList) wstringEx Pth; if(m_gameList.empty()) { + cachecovers = false; if(m_source_cnt > 1) { Msg = _t("main8", L"game list empty!"); @@ -498,6 +499,7 @@ int CMenu::main(void) show_channel = !m_cfg.getBool(CHANNEL_DOMAIN, "disable", false); show_plugin = !m_cfg.getBool(PLUGIN_DOMAIN, "disable", false); show_gamecube = !m_cfg.getBool(GC_DOMAIN, "disable", false); + show_homebrew = !m_cfg.getBool(HOMEBREW_DOMAIN, "disable", false); _showMain(); } else if(m_btnMgr.selected(m_mainBtnCategories))