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

- fixes for two mistakes in 5.4.7

Browse Source 
- upped to 5.4 8
This commit is contained in:
Fledge68 2020-11-11 13:24:29 -06:00
parent 05222fb685
commit e6beda957a
7 changed files with 9 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
out/bins/ext_booter.bin
View File

Binary file not shown.

BIN
out/boot.dol
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 MiB

After

Width:  |  Height:  |  Size: 4.1 MiB

2
source/defines.h
View File

@ -1,6 +1,6 @@
#define APP_NAME "WiiFlow WFL"
#define APP_VERSION "5.4.7"
#define APP_VERSION "5.4.8"
#define APP_DATA_DIR "wiiflow"
#define APPS_DIR "apps/wiiflow"

2
source/gui/coverflow.cpp
View File

@ -1974,7 +1974,7 @@ bool CCoverFlow::start(const string &m_imgsDir)
if(TexHandle.fromImageFile(m_flatNoCoverTexture, fmt("%s/flatnopic.png", m_imgsDir.c_str()), GX_TF_CMPR, 32, 512) != TE_OK)
return false;
}
m_defcovers_loaded = false;
m_defcovers_loaded = true;
}
/* allocate enough memory for the covers list (m_covers) based on rows * columns (m_range) */

43
source/menu/menu.cpp
View File

@ -630,13 +630,11 @@ void CMenu::_loadCFCfg()
);
// Textures
/*
string texLoading = fmt("%s/%s", m_themeDataDir.c_str(), m_theme.getString(domain, "loading_cover_box").c_str());
string texNoCover = fmt("%s/%s", m_themeDataDir.c_str(), m_theme.getString(domain, "missing_cover_box").c_str());
string texLoadingFlat = fmt("%s/%s", m_themeDataDir.c_str(), m_theme.getString(domain, "loading_cover_flat").c_str());
string texNoCoverFlat = fmt("%s/%s", m_themeDataDir.c_str(), m_theme.getString(domain, "missing_cover_flat").c_str());
CoverFlow.setTextures(texLoading, texLoadingFlat, texNoCover, texNoCoverFlat);
*/
// Font
CoverFlow.setFont(_font(domain, "font", theme.titleFont), m_theme.getColor(domain, "font_color", CColor(0xFFFFFFFF)));
}
@ -2003,47 +2001,6 @@ void CMenu::_initCF(void)
char id[74];
char catID[64];
// Set loading and no cover textures
// Set box no cover to custom blank cover to use for spine and back of cover if only front image available
string texLoading = fmt("%s/%s", m_themeDataDir.c_str(), m_theme.getString("_COVERFLOW", "loading_cover_box").c_str());
string texLoadingFlat = fmt("%s/%s", m_themeDataDir.c_str(), m_theme.getString("_COVERFLOW", "loading_cover_flat").c_str());
string texNoCoverFlat = fmt("%s/%s", m_themeDataDir.c_str(), m_theme.getString("_COVERFLOW", "missing_cover_flat").c_str());
string texNoCover = fmt("%s/%s", m_themeDataDir.c_str(), m_theme.getString("_COVERFLOW", "missing_cover_box").c_str());
string temp;
if(m_source_cnt == 1 && m_platform.loaded())
{
if(m_current_view == COVERFLOW_PLUGIN)
{
u8 i = 0;
string name;
while(m_plugin.PluginExist(i) && !m_plugin.GetEnabledStatus(i)){ ++i; }
if(m_plugin.PluginExist(i))
name = m_platform.getString("PLUGINS", sfmt("%08x", m_plugin.GetPluginMagic(i)), "");
if(!name.empty())
{
bool match = true;
i++;
while(m_plugin.PluginExist(i))
{
if(m_plugin.GetEnabledStatus(i) && name != m_platform.getString("PLUGINS", sfmt("%08x", m_plugin.GetPluginMagic(i)), ""))
{
match = false;
break;
}
i++;
}
/* if all match we use that blank cover image */
if(match)
temp = getBlankCoverPath(&m_gameList[0]);
}
}
else
temp = getBlankCoverPath(&m_gameList[0]);
if(!temp.empty() && fsop_FileExist(temp.c_str()))
texNoCover = temp;
}
CoverFlow.setTextures(texLoading, texLoadingFlat, texNoCover, texNoCoverFlat);
// filter list based on categories and favorites
for(vector<dir_discHdr>::iterator hdr = m_gameList.begin(); hdr != m_gameList.end(); ++hdr)
{

12
source/menu/menu_sm_editor.cpp
View File

@ -219,7 +219,7 @@ void CMenu::_checkboxesMenu(u8 md)
{
if(m_btnMgr.selected(m_checkboxBtn[i]))
{
if(mode == 1)
if(mode == 1)// hide source button
{
string button = sfmt("button_%i", firstCheckbox + i - 1);
bool val = !m_source.getBool(button, "hidden", false);
@ -228,7 +228,7 @@ void CMenu::_checkboxesMenu(u8 md)
m_btnMgr.setSelected(m_checkboxBtn[i]);
break;
}
else if(mode == 2)
else if(mode == 2)// link - choose source
{
string source = m_source.getString(sfmt("button_%i", firstCheckbox + i - 1), "source", "");
if(source != "plugin")
@ -239,7 +239,7 @@ void CMenu::_checkboxesMenu(u8 md)
}
else
{
mode = 4;
mode = 4;// link - choose plugins
curSource = firstCheckbox + i - 1;
max_checkbox = 0;
while(m_plugin.PluginExist(max_checkbox)) max_checkbox++;
@ -257,7 +257,7 @@ void CMenu::_checkboxesMenu(u8 md)
m_btnMgr.show(m_checkboxesLblTitle);
}
}
else if(mode == 4)
else if(mode == 4)// link - choose plugins
{
bool found = false;
u8 pluginsCount = 0;
@ -274,7 +274,7 @@ void CMenu::_checkboxesMenu(u8 md)
{
found = true;// and don't add it
}
else if(m_plugin.GetPluginPosition(strtoul(magicNums[i].c_str(), NULL, 16)) < 255)// make sure plugin exist
else if(m_plugin.GetPluginPosition(strtoul(magicNums[j].c_str(), NULL, 16)) < 255)// make sure plugin exist
{
if(pluginsCount == 0)
newMagics = magicNums[j];
@ -295,7 +295,7 @@ void CMenu::_checkboxesMenu(u8 md)
m_source.setString(button, "magic", newMagics);
_updateCheckboxes();
}
else if(mode == 3)
else if(mode == 3)// set roms path
{
_hideCheckboxesMenu();
u8 pos = firstCheckbox + i - 1;

2
source/plugin/plugin.cpp
View File

@ -69,7 +69,7 @@ void Plugin::init(const string& m_pluginsDir)
if(iniFile->find("scummvm.ini") != string::npos)
continue;
m_plugin_cfg.load(iniFile->c_str());
if(m_plugin_cfg.loaded() && Plugins.size() < 256)// max plugins count = 255
if(m_plugin_cfg.loaded() && Plugins.size() < 255)// max plugins count = 255
{
m_plugin.AddPlugin(m_plugin_cfg, *iniFile);
}