- fixes for two mistakes in 5.4.7

- upped to 5.4 8
Fledge68 · Nov 11, 2020 · e6beda9 · e6beda9
1 parent 05222fb
commit e6beda9
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 52 deletions.
diff --git a/out/bins/ext_booter.bin b/out/bins/ext_booter.bin
diff --git a/out/boot.dol b/out/boot.dol
diff --git a/source/defines.h b/source/defines.h
@@ -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"

diff --git a/source/gui/coverflow.cpp b/source/gui/coverflow.cpp
@@ -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) */

diff --git a/source/menu/menu.cpp b/source/menu/menu.cpp
@@ -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)
 	{

diff --git a/source/menu/menu_sm_editor.cpp b/source/menu/menu_sm_editor.cpp
@@ -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;

diff --git a/source/plugin/plugin.cpp b/source/plugin/plugin.cpp
@@ -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);
 			}