The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2024-12-26 20:01:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

-fixed background music (zomg the first menu which is not

Browse Source 
defined in the menu.hpp itself)
This commit is contained in:
fix94.1 2012-05-05 21:36:30 +00:00
parent 88c4eed3c3
commit 14aa9863af
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/menu/menu.cpp
View File

@ -434,8 +434,6 @@ void CMenu::init(void)
m_favorites = m_cfg.getBool(domain, "favorites", false); m_favorites = m_cfg.getBool(domain, "favorites", false);
m_max_categories = m_cat.getInt("GENERAL", "numcategories", 21); m_max_categories = m_cat.getInt("GENERAL", "numcategories", 21);
m_plugins = 0;
m_cfg.setString("GAMERCARD", "gamercards", "wiinnertag|dutag"); m_cfg.setString("GAMERCARD", "gamercards", "wiinnertag|dutag");
m_cfg.getString("GAMERCARD", "wiinnertag_url", WIINNERTAG_URL); m_cfg.getString("GAMERCARD", "wiinnertag_url", WIINNERTAG_URL);
m_cfg.getString("GAMERCARD", "wiinnertag_key", ""); m_cfg.getString("GAMERCARD", "wiinnertag_key", "");

13
source/menu/menu.hpp
View File

@ -141,7 +141,6 @@ private:
STexture m_gameSettingsBg; STexture m_gameSettingsBg;
STexture m_gameBgLQ; STexture m_gameBgLQ;
STexture m_mainBgLQ; STexture m_mainBgLQ;
STexture m_pluginBg;
STexture m_categoryBg; STexture m_categoryBg;
// //
u32 m_errorLblMessage; u32 m_errorLblMessage;
@ -554,18 +553,6 @@ private:
u32 m_categoryBtnCats[21]; u32 m_categoryBtnCats[21];
u32 m_categoryLblUser[4]; u32 m_categoryLblUser[4];
u8 m_max_categories; u8 m_max_categories;
// Plugin menu
u32 m_pluginLblPage;
u32 m_pluginBtnPageM;
u32 m_pluginBtnPageP;
u32 m_pluginBtnBack;
u32 m_pluginLblTitle;
u32 m_pluginLblCat[21];
u32 m_pluginBtn[21];
u32 m_pluginBtnCat[21];
u32 m_pluginBtnCats[21];
u32 m_pluginLblUser[4];
u8 m_plugins;
// NandEmulation menu // NandEmulation menu
std::string m_saveExtGameId; std::string m_saveExtGameId;
bool m_nandext; bool m_nandext;

26
source/menu/menu_plugin.cpp
View File

@ -3,10 +3,23 @@
#include <string.h> #include <string.h>
#include <gccore.h> #include <gccore.h>
u8 m_Plugins[21];
u32 Plugin_curPage; u32 Plugin_curPage;
u8 Plugin_lastBtn; u8 Plugin_lastBtn;
// Plugin menu
u32 m_pluginLblPage;
u32 m_pluginBtnPageM;
u32 m_pluginBtnPageP;
u32 m_pluginBtnBack;
u32 m_pluginLblTitle;
u32 m_pluginLblCat[21];
u32 m_pluginBtn[21];
u32 m_pluginBtnCat[21];
u32 m_pluginBtnCats[21];
u32 m_pluginLblUser[4];
u8 m_max_plugins;
STexture m_pluginBg;
void CMenu::_hidePluginSettings(bool instant) void CMenu::_hidePluginSettings(bool instant)
{ {
m_btnMgr.hide(m_pluginLblTitle, instant); m_btnMgr.hide(m_pluginLblTitle, instant);
@ -42,7 +55,7 @@ void CMenu::_showPluginSettings(void)
void CMenu::_updatePluginCheckboxes(void) void CMenu::_updatePluginCheckboxes(void)
{ {
if(m_plugins > 10) if(m_max_plugins > 10)
{ {
m_btnMgr.setText(m_pluginLblPage, wfmt(L"%i / 2", Plugin_curPage)); m_btnMgr.setText(m_pluginLblPage, wfmt(L"%i / 2", Plugin_curPage));
m_btnMgr.show(m_pluginLblPage); m_btnMgr.show(m_pluginLblPage);
@ -59,8 +72,8 @@ void CMenu::_updatePluginCheckboxes(void)
if(Plugin_curPage == 1) if(Plugin_curPage == 1)
{ {
int j = 11; int j = 11;
if(m_plugins < 11) if(m_max_plugins < 11)
j = m_plugins; j = m_max_plugins;
for(u8 i = 0; i < j; ++i) for(u8 i = 0; i < j; ++i)
{ {
m_btnMgr.show(m_pluginLblCat[i]); m_btnMgr.show(m_pluginLblCat[i]);
@ -73,7 +86,7 @@ void CMenu::_updatePluginCheckboxes(void)
} }
else else
{ {
for(int i = 11; i < m_plugins; ++i) for(int i = 11; i < m_max_plugins; ++i)
{ {
m_btnMgr.show(m_pluginLblCat[i]); m_btnMgr.show(m_pluginLblCat[i]);
m_pluginBtn[i] = m_pluginBtnCat[i]; m_pluginBtn[i] = m_pluginBtnCat[i];
@ -199,6 +212,7 @@ void CMenu::_initPluginSettingsMenu(CMenu::SThemeData &theme)
_setHideAnim(m_pluginLblCat[i], fmt("PLUGIN/PLUGIN_%i", i), 0, 0, 1.f, 0.f); _setHideAnim(m_pluginLblCat[i], fmt("PLUGIN/PLUGIN_%i", i), 0, 0, 1.f, 0.f);
m_pluginBtn[i] = m_pluginBtnCat[i]; m_pluginBtn[i] = m_pluginBtnCat[i];
} }
m_max_plugins = 0;
_hidePluginSettings(true); _hidePluginSettings(true);
_textPluginSettings(); _textPluginSettings();
} }
@ -218,7 +232,7 @@ void CMenu::_textPluginSettings(void)
m_btnMgr.setText(m_pluginLblCat[i], m_plugin.GetPluginName(i - 1)); m_btnMgr.setText(m_pluginLblCat[i], m_plugin.GetPluginName(i - 1));
else else
{ {
m_plugins = i; m_max_plugins = i;
break; break;
} }
} }