diff --git a/source/gui/gui.cpp b/source/gui/gui.cpp index b17eb77f..a099fb4c 100644 --- a/source/gui/gui.cpp +++ b/source/gui/gui.cpp @@ -29,7 +29,7 @@ bool CButtonsMgr::init(CVideo &vid) return true; } -u32 CButtonsMgr::addButton(SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, +u16 CButtonsMgr::addButton(SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, const SButtonTextureSet &texSet, const SmartGuiSound &clickSound, const SmartGuiSound &hoverSound) { CButtonsMgr::SButton *b = new CButtonsMgr::SButton; @@ -56,13 +56,13 @@ u32 CButtonsMgr::addButton(SFont font, const wstringEx &text, int x, int y, u32 b->moveByX = 0; b->moveByY = 0; - u32 sz = m_elts.size(); + u16 sz = m_elts.size(); m_elts.push_back(elt); return m_elts.size() > sz ? m_elts.size() - 1 : -2; } -void CButtonsMgr::reset(u32 id, bool instant) +void CButtonsMgr::reset(u16 id, bool instant) { if (id < m_elts.size()) { @@ -81,7 +81,7 @@ void CButtonsMgr::reset(u32 id, bool instant) } } -void CButtonsMgr::moveBy(u32 id, int x, int y, bool instant) +void CButtonsMgr::moveBy(u16 id, int x, int y, bool instant) { if (id < m_elts.size()) { @@ -100,7 +100,7 @@ void CButtonsMgr::moveBy(u32 id, int x, int y, bool instant) } } -void CButtonsMgr::getDimensions(u32 id, int &x, int &y, u32 &width, u32 &height) +void CButtonsMgr::getDimensions(u16 id, int &x, int &y, u32 &width, u32 &height) { if (id < m_elts.size()) { @@ -119,7 +119,7 @@ void CButtonsMgr::getDimensions(u32 id, int &x, int &y, u32 &width, u32 &height) } } -void CButtonsMgr::hide(u32 id, int dx, int dy, float scaleX, float scaleY, bool instant) +void CButtonsMgr::hide(u16 id, int dx, int dy, float scaleX, float scaleY, bool instant) { if (id < m_elts.size()) { @@ -146,7 +146,7 @@ void CButtonsMgr::hide(u32 id, int dx, int dy, float scaleX, float scaleY, bool } } -void CButtonsMgr::hide(u32 id, bool instant) +void CButtonsMgr::hide(u16 id, bool instant) { if (id < m_elts.size()) { @@ -173,7 +173,7 @@ void CButtonsMgr::setSoundVolume(int vol) m_soundVolume = min(max(0, vol), 0xFF); } -void CButtonsMgr::show(u32 id, bool instant) +void CButtonsMgr::show(u16 id, bool instant) { if (id < m_elts.size()) { @@ -245,7 +245,7 @@ void CButtonsMgr::mouse(int chan, int x, int y) } } -bool CButtonsMgr::selected(u32 button) +bool CButtonsMgr::selected(u16 button) { for(int chan = WPAD_MAX_WIIMOTES-1; chan >= 0; chan--) { @@ -324,14 +324,14 @@ void CButtonsMgr::noClick(bool noclick) m_noclick = noclick; } -void CButtonsMgr::click(u32 id) +void CButtonsMgr::click(u16 id) { for(int chan = WPAD_MAX_WIIMOTES-1; chan >= 0; chan--) { WPAD_Rumble(chan, 0); PAD_ControlMotor(chan, 0); - if (id == (u32)-1) id = m_selected[chan]; + if (id == (u16)-1) id = m_selected[chan]; if (id < m_elts.size() && m_elts[id]->t == CButtonsMgr::GUIELT_BUTTON) { CButtonsMgr::SButton &b = *((CButtonsMgr::SButton *)m_elts[id].get()); @@ -384,7 +384,7 @@ void CButtonsMgr::tick(void) } -u32 CButtonsMgr::addLabel(SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, u16 style, const STexture &bg) +u16 CButtonsMgr::addLabel(SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, u16 style, const STexture &bg) { CButtonsMgr::SLabel *b = new CButtonsMgr::SLabel; SmartPtr elt(b); @@ -409,13 +409,13 @@ u32 CButtonsMgr::addLabel(SFont font, const wstringEx &text, int x, int y, u32 w b->moveByX = 0; b->moveByY = 0; - u32 sz = m_elts.size(); + u16 sz = m_elts.size(); m_elts.push_back(elt); return m_elts.size() > sz ? m_elts.size() - 1 : -2; } -u32 CButtonsMgr::addProgressBar(int x, int y, u32 width, u32 height, SButtonTextureSet &texSet) +u16 CButtonsMgr::addProgressBar(int x, int y, u32 width, u32 height, SButtonTextureSet &texSet) { CButtonsMgr::SProgressBar *b = new CButtonsMgr::SProgressBar; SmartPtr elt(b); @@ -437,33 +437,31 @@ u32 CButtonsMgr::addProgressBar(int x, int y, u32 width, u32 height, SButtonText b->moveByX = 0; b->moveByY = 0; - u32 sz = m_elts.size(); + u16 sz = m_elts.size(); m_elts.push_back(elt); return m_elts.size() > sz ? m_elts.size() - 1 : -2; } -u32 CButtonsMgr::addPicButton(STexture &texNormal, STexture &texSelected, int x, int y, u32 width, u32 height, const SmartGuiSound &clickSound, const SmartGuiSound &hoverSound) +u16 CButtonsMgr::addPicButton(STexture &texNormal, STexture &texSelected, int x, int y, u32 width, u32 height, const SmartGuiSound &clickSound, const SmartGuiSound &hoverSound) { SButtonTextureSet texSet; texSet.center = texNormal; texSet.centerSel = texSelected; - u32 i = addButton(SFont(), wstringEx(), x, y, width, height, CColor(), texSet, clickSound, hoverSound); - return i; + return addButton(SFont(), wstringEx(), x, y, width, height, CColor(), texSet, clickSound, hoverSound); } -u32 CButtonsMgr::addPicButton(const u8 *pngNormal, const u8 *pngSelected, int x, int y, u32 width, u32 height, const SmartGuiSound &clickSound, const SmartGuiSound &hoverSound) +u16 CButtonsMgr::addPicButton(const u8 *pngNormal, const u8 *pngSelected, int x, int y, u32 width, u32 height, const SmartGuiSound &clickSound, const SmartGuiSound &hoverSound) { SButtonTextureSet texSet; texSet.center.fromPNG(pngNormal); texSet.centerSel.fromPNG(pngSelected); - u32 i = addButton(SFont(), wstringEx(), x, y, width, height, CColor(), texSet, clickSound, hoverSound); - return i; + return addButton(SFont(), wstringEx(), x, y, width, height, CColor(), texSet, clickSound, hoverSound); } -void CButtonsMgr::setText(u32 id, const wstringEx &text, bool unwrap) +void CButtonsMgr::setText(u16 id, const wstringEx &text, bool unwrap) { if (id < m_elts.size()) { @@ -485,7 +483,7 @@ void CButtonsMgr::setText(u32 id, const wstringEx &text, bool unwrap) } } -void CButtonsMgr::setText(u32 id, const wstringEx &text, u32 startline,bool unwrap) +void CButtonsMgr::setText(u16 id, const wstringEx &text, u32 startline,bool unwrap) { if (id < m_elts.size()) { @@ -507,7 +505,7 @@ void CButtonsMgr::setText(u32 id, const wstringEx &text, u32 startline,bool unwr } } -void CButtonsMgr::setTexture(u32 id, STexture &bg) +void CButtonsMgr::setTexture(u16 id, STexture &bg) { if (id < m_elts.size()) { @@ -526,7 +524,7 @@ void CButtonsMgr::setTexture(u32 id, STexture &bg) } } -void CButtonsMgr::setTexture(u32 id, STexture &bg, int width, int height) +void CButtonsMgr::setTexture(u16 id, STexture &bg, int width, int height) { if (id < m_elts.size()) { @@ -547,7 +545,7 @@ void CButtonsMgr::setTexture(u32 id, STexture &bg, int width, int height) } } -void CButtonsMgr::setProgress(u32 id, float f, bool instant) +void CButtonsMgr::setProgress(u16 id, float f, bool instant) { if (m_elts[id]->t == CButtonsMgr::GUIELT_PROGRESS) { diff --git a/source/gui/gui.hpp b/source/gui/gui.hpp index 9a8b8f3b..765e32ba 100644 --- a/source/gui/gui.hpp +++ b/source/gui/gui.hpp @@ -30,25 +30,25 @@ public: bool init(CVideo &vid); void setRumble(bool enabled) { m_rumbleEnabled = enabled; } void reserve(u32 capacity) { m_elts.reserve(capacity); } - u32 addButton(SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, + u16 addButton(SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, const SButtonTextureSet &texSet, const SmartGuiSound &clickSound = _noSound, const SmartGuiSound &hoverSound = _noSound); - u32 addLabel(SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, u16 style, const STexture &bg = _noTexture); - u32 addPicButton(const u8 *pngNormal, const u8 *pngSelected, int x, int y, u32 width, u32 height, + u16 addLabel(SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, u16 style, const STexture &bg = _noTexture); + u16 addPicButton(const u8 *pngNormal, const u8 *pngSelected, int x, int y, u32 width, u32 height, const SmartGuiSound &clickSound = _noSound, const SmartGuiSound &hoverSound = _noSound); - u32 addPicButton(STexture &texNormal, STexture &texSelected, int x, int y, u32 width, u32 height, + u16 addPicButton(STexture &texNormal, STexture &texSelected, int x, int y, u32 width, u32 height, const SmartGuiSound &clickSound = _noSound, const SmartGuiSound &hoverSound = _noSound); - u32 addProgressBar(int x, int y, u32 width, u32 height, SButtonTextureSet &texSet); - void setText(u32 id, const wstringEx &text, bool unwrap = false); - void setText(u32 id, const wstringEx &text, u32 startline, bool unwrap = false); - void setTexture(u32 id ,STexture &bg); - void setTexture(u32 id, STexture &bg, int width, int height); - void setProgress(u32 id, float f, bool instant = false); - void reset(u32 id, bool instant = false); - void moveBy(u32 id, int x, int y, bool instant = false); - void getDimensions(u32 id, int &x, int &y, u32 &width, u32 &height); - void hide(u32 id, int dx, int dy, float scaleX, float scaleY, bool instant = false); - void hide(u32 id, bool instant = false); - void show(u32 id, bool instant = false); + u16 addProgressBar(int x, int y, u32 width, u32 height, SButtonTextureSet &texSet); + void setText(u16 id, const wstringEx &text, bool unwrap = false); + void setText(u16 id, const wstringEx &text, u32 startline, bool unwrap = false); + void setTexture(u16 id ,STexture &bg); + void setTexture(u16 id, STexture &bg, int width, int height); + void setProgress(u16 id, float f, bool instant = false); + void reset(u16 id, bool instant = false); + void moveBy(u16 id, int x, int y, bool instant = false); + void getDimensions(u16 id, int &x, int &y, u32 &width, u32 &height); + void hide(u16 id, int dx, int dy, float scaleX, float scaleY, bool instant = false); + void hide(u16 id, bool instant = false); + void show(u16 id, bool instant = false); void mouse(int chan, int x, int y); void up(void); void down(void); @@ -56,8 +56,8 @@ public: void tick(void); void noClick(bool noclick = false); void noHover(bool nohover = false); - void click(u32 id = (u32)-1); - bool selected(u32 button = (u32)-1); + void click(u16 id = (u32)-1); + bool selected(u16 button = (u32)-1); void setRumble(int, bool wii = false, bool gc = false); void deselect(void){ for(int chan = WPAD_MAX_WIIMOTES-1; chan >= 0; chan--) m_selected[chan] = (u32)-1; } void stopSounds(void); diff --git a/source/menu/menu.cpp b/source/menu/menu.cpp index 9216c344..008909af 100644 --- a/source/menu/menu.cpp +++ b/source/menu/menu.cpp @@ -1246,7 +1246,7 @@ u16 CMenu::_textStyle(const char *domain, const char *key, u16 def) return textStyle; } -u32 CMenu::_addButton(CMenu::SThemeData &theme, const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color) +u16 CMenu::_addButton(CMenu::SThemeData &theme, const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color) { SButtonTextureSet btnTexSet; CColor c(color); @@ -1277,7 +1277,7 @@ u32 CMenu::_addButton(CMenu::SThemeData &theme, const char *domain, SFont font, return m_btnMgr.addButton(font, text, x, y, width, height, c, btnTexSet, clickSound, hoverSound); } -u32 CMenu::_addSelButton(CMenu::SThemeData &theme, const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color) +u16 CMenu::_addSelButton(CMenu::SThemeData &theme, const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color) { SButtonTextureSet btnTexSet; CColor c(color); @@ -1308,7 +1308,7 @@ u32 CMenu::_addSelButton(CMenu::SThemeData &theme, const char *domain, SFont fon return m_btnMgr.addButton(font, text, x, y, width, height, c, btnTexSet, clickSound, hoverSound); } -u32 CMenu::_addPicButton(CMenu::SThemeData &theme, const char *domain, STexture &texNormal, STexture &texSelected, int x, int y, u32 width, u32 height) +u16 CMenu::_addPicButton(CMenu::SThemeData &theme, const char *domain, STexture &texNormal, STexture &texSelected, int x, int y, u32 width, u32 height) { x = m_theme.getInt(domain, "x", x); y = m_theme.getInt(domain, "y", y); @@ -1328,7 +1328,7 @@ u32 CMenu::_addPicButton(CMenu::SThemeData &theme, const char *domain, STexture return m_btnMgr.addPicButton(tex1, tex2, x, y, width, height, clickSound, hoverSound); } -u32 CMenu::_addTitle(CMenu::SThemeData &theme, const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, u16 style) +u16 CMenu::_addTitle(CMenu::SThemeData &theme, const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, u16 style) { CColor c(color); @@ -1349,7 +1349,7 @@ u32 CMenu::_addTitle(CMenu::SThemeData &theme, const char *domain, SFont font, c return m_btnMgr.addLabel(font, text, x, y, width, height, c, style); } -u32 CMenu::_addText(CMenu::SThemeData &theme, const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, u16 style) +u16 CMenu::_addText(CMenu::SThemeData &theme, const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, u16 style) { CColor c(color); @@ -1370,7 +1370,7 @@ u32 CMenu::_addText(CMenu::SThemeData &theme, const char *domain, SFont font, co return m_btnMgr.addLabel(font, text, x, y, width, height, c, style); } -u32 CMenu::_addLabel(CMenu::SThemeData &theme, const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, u16 style) +u16 CMenu::_addLabel(CMenu::SThemeData &theme, const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, u16 style) { CColor c(color); @@ -1391,7 +1391,7 @@ u32 CMenu::_addLabel(CMenu::SThemeData &theme, const char *domain, SFont font, c return m_btnMgr.addLabel(font, text, x, y, width, height, c, style); } -u32 CMenu::_addLabel(CMenu::SThemeData &theme, const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, u16 style, STexture &bg) +u16 CMenu::_addLabel(CMenu::SThemeData &theme, const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, u16 style, STexture &bg) { CColor c(color); @@ -1413,7 +1413,7 @@ u32 CMenu::_addLabel(CMenu::SThemeData &theme, const char *domain, SFont font, c return m_btnMgr.addLabel(font, text, x, y, width, height, c, style, texBg); } -u32 CMenu::_addProgressBar(CMenu::SThemeData &theme, const char *domain, int x, int y, u32 width, u32 height) +u16 CMenu::_addProgressBar(CMenu::SThemeData &theme, const char *domain, int x, int y, u32 width, u32 height) { SButtonTextureSet btnTexSet; @@ -1437,7 +1437,7 @@ u32 CMenu::_addProgressBar(CMenu::SThemeData &theme, const char *domain, int x, return m_btnMgr.addProgressBar(x, y, width, height, btnTexSet); } -void CMenu::_setHideAnim(u32 id, const char *domain, int dx, int dy, float scaleX, float scaleY) +void CMenu::_setHideAnim(u16 id, const char *domain, int dx, int dy, float scaleX, float scaleY) { dx = m_theme.getInt(domain, "effect_x", dx); dy = m_theme.getInt(domain, "effect_y", dy); @@ -1463,15 +1463,15 @@ void CMenu::_setHideAnim(u32 id, const char *domain, int dx, int dy, float scale m_btnMgr.hide(id, dx, dy, scaleX, scaleY, true); } -void CMenu::_addUserLabels(CMenu::SThemeData &theme, u32 *ids, u32 size, const char *domain) +void CMenu::_addUserLabels(CMenu::SThemeData &theme, u16 *ids, u32 size, const char *domain) { _addUserLabels(theme, ids, 0, size, domain); } -void CMenu::_addUserLabels(CMenu::SThemeData &theme, u32 *ids, u32 start, u32 size, const char *domain) +void CMenu::_addUserLabels(CMenu::SThemeData &theme, u16 *ids, u32 start, u32 size, const char *domain) { - for (u32 i = start; i < start + size; ++i) + for(u32 i = start; i < start + size; ++i) { string dom(sfmt("%s/USER%i", domain, i + 1)); if (m_theme.hasDomain(dom)) @@ -1481,7 +1481,7 @@ void CMenu::_addUserLabels(CMenu::SThemeData &theme, u32 *ids, u32 start, u32 si _setHideAnim(ids[i], dom.c_str(), -50, 0, 0.f, 0.f); } else - ids[i] = -1u; + ids[i] = (u16)-1; } } diff --git a/source/menu/menu.hpp b/source/menu/menu.hpp index e8984009..feb7fe07 100644 --- a/source/menu/menu.hpp +++ b/source/menu/menu.hpp @@ -47,7 +47,7 @@ public: void exitHandler(void); int main(void); void cleanup(bool ios_reload = false); - u32 m_current_view; + u8 m_current_view; private: struct SZone { @@ -147,11 +147,11 @@ private: STexture m_mainBgLQ; STexture m_categoryBg; //Main Coverflow - u32 m_mainBtnConfig; - u32 m_mainBtnInfo; - u32 m_mainBtnFavoritesOn; - u32 m_mainBtnFavoritesOff; - u32 m_mainLblLetter; + u16 m_mainBtnConfig; + u16 m_mainBtnInfo; + u16 m_mainBtnFavoritesOn; + u16 m_mainBtnFavoritesOff; + u16 m_mainLblLetter; #ifdef SHOWMEM u32 m_mem2FreeSize; #endif @@ -161,122 +161,122 @@ private: unsigned int mem2old; unsigned int mem2; #endif - u32 m_mainLblNotice; - u32 m_mainBtnNext; - u32 m_mainBtnPrev; - u32 m_mainBtnQuit; - u32 m_mainBtnDVD; - u32 m_mainBtnDML; - u32 m_mainBtnEmu; - u32 m_mainBtnUsb; - u32 m_mainBtnChannel; - u32 m_mainBtnHomebrew; - u32 m_mainBtnInit; - u32 m_mainBtnInit2; - u32 m_mainLblInit; - u32 m_mainLblUser[6]; + u16 m_mainLblNotice; + u16 m_mainBtnNext; + u16 m_mainBtnPrev; + u16 m_mainBtnQuit; + u16 m_mainBtnDVD; + u16 m_mainBtnDML; + u16 m_mainBtnEmu; + u16 m_mainBtnUsb; + u16 m_mainBtnChannel; + u16 m_mainBtnHomebrew; + u16 m_mainBtnInit; + u16 m_mainBtnInit2; + u16 m_mainLblInit; + u16 m_mainLblUser[6]; u8 m_show_dml; bool m_new_dml; bool m_GameTDBLoaded; //Main Config menus - u32 m_configLblPage; - u32 m_configBtnPageM; - u32 m_configBtnPageP; - u32 m_configBtnBack; - u32 m_configLblTitle; - u32 m_configLblDownload; - u32 m_configBtnDownload; - u32 m_configLblParental; - u32 m_configBtnUnlock; - u32 m_configBtnSetCode; - u32 m_configLblPartitionName; - u32 m_configLblPartition; - u32 m_configBtnPartitionP; - u32 m_configBtnPartitionM; - u32 m_configLblCfg4; - u32 m_configBtnCfg4; - u32 m_configLblUser[4]; - u32 m_configAdvLblTheme; - u32 m_configAdvLblCurTheme; - u32 m_configAdvBtnCurThemeM; - u32 m_configAdvBtnCurThemeP; - u32 m_configAdvLblLanguage; - u32 m_configAdvLblCurLanguage; - u32 m_configAdvBtnCurLanguageM; - u32 m_configAdvBtnCurLanguageP; - u32 m_configAdvLblCFTheme; - u32 m_configAdvBtnCFTheme; - u32 m_configAdvLblInstall; - u32 m_configAdvBtnInstall; - u32 m_configAdvLblUser[4]; - u32 m_config3LblGameLanguage; - u32 m_config3LblLanguage; - u32 m_config3BtnLanguageP; - u32 m_config3BtnLanguageM; - u32 m_config3LblGameVideo; - u32 m_config3LblVideo; - u32 m_config3BtnVideoP; - u32 m_config3BtnVideoM; + u16 m_configLblPage; + u16 m_configBtnPageM; + u16 m_configBtnPageP; + u16 m_configBtnBack; + u16 m_configLblTitle; + u16 m_configLblDownload; + u16 m_configBtnDownload; + u16 m_configLblParental; + u16 m_configBtnUnlock; + u16 m_configBtnSetCode; + u16 m_configLblPartitionName; + u16 m_configLblPartition; + u16 m_configBtnPartitionP; + u16 m_configBtnPartitionM; + u16 m_configLblCfg4; + u16 m_configBtnCfg4; + u16 m_configLblUser[4]; + u16 m_configAdvLblTheme; + u16 m_configAdvLblCurTheme; + u16 m_configAdvBtnCurThemeM; + u16 m_configAdvBtnCurThemeP; + u16 m_configAdvLblLanguage; + u16 m_configAdvLblCurLanguage; + u16 m_configAdvBtnCurLanguageM; + u16 m_configAdvBtnCurLanguageP; + u16 m_configAdvLblCFTheme; + u16 m_configAdvBtnCFTheme; + u16 m_configAdvLblInstall; + u16 m_configAdvBtnInstall; + u16 m_configAdvLblUser[4]; + u16 m_config3LblGameLanguage; + u16 m_config3LblLanguage; + u16 m_config3BtnLanguageP; + u16 m_config3BtnLanguageM; + u16 m_config3LblGameVideo; + u16 m_config3LblVideo; + u16 m_config3BtnVideoP; + u16 m_config3BtnVideoM; - u32 m_config3LblDMLGameLanguage; - u32 m_config3LblDMLLanguage; - u32 m_config3BtnDMLLanguageP; - u32 m_config3BtnDMLLanguageM; - u32 m_config3LblDMLGameVideo; - u32 m_config3LblDMLVideo; - u32 m_config3BtnDMLVideoP; - u32 m_config3BtnDMLVideoM; + u16 m_config3LblDMLGameLanguage; + u16 m_config3LblDMLLanguage; + u16 m_config3BtnDMLLanguageP; + u16 m_config3BtnDMLLanguageM; + u16 m_config3LblDMLGameVideo; + u16 m_config3LblDMLVideo; + u16 m_config3BtnDMLVideoP; + u16 m_config3BtnDMLVideoM; - u32 m_config3LblOcarina; - u32 m_config3BtnOcarina; - u32 m_config3LblAsyncNet; - u32 m_config3BtnAsyncNet; - u32 m_config3LblUser[4]; - u32 m_config4LblReturnTo; - u32 m_config4LblReturnToVal; - u32 m_config4BtnReturnToM; - u32 m_config4BtnReturnToP; - u32 m_config4LblHome; - u32 m_config4BtnHome; - u32 m_config4LblSaveFavMode; - u32 m_config4BtnSaveFavMode; - u32 m_config4LblCategoryOnBoot; - u32 m_config4BtnCategoryOnBoot; - u32 m_config4LblUser[4]; - u32 m_configSndLblBnrVol; - u32 m_configSndLblBnrVolVal; - u32 m_configSndBtnBnrVolP; - u32 m_configSndBtnBnrVolM; - u32 m_configSndLblMusicVol; - u32 m_configSndLblMusicVolVal; - u32 m_configSndBtnMusicVolP; - u32 m_configSndBtnMusicVolM; - u32 m_configSndLblGuiVol; - u32 m_configSndLblGuiVolVal; - u32 m_configSndBtnGuiVolP; - u32 m_configSndBtnGuiVolM; - u32 m_configSndLblCFVol; - u32 m_configSndLblCFVolVal; - u32 m_configSndBtnCFVolP; - u32 m_configSndBtnCFVolM; - u32 m_configSndLblUser[4]; - u32 m_configScreenLblTVHeight; - u32 m_configScreenLblTVHeightVal; - u32 m_configScreenBtnTVHeightP; - u32 m_configScreenBtnTVHeightM; - u32 m_configScreenLblTVWidth; - u32 m_configScreenLblTVWidthVal; - u32 m_configScreenBtnTVWidthP; - u32 m_configScreenBtnTVWidthM; - u32 m_configScreenLblTVX; - u32 m_configScreenLblTVXVal; - u32 m_configScreenBtnTVXM; - u32 m_configScreenBtnTVXP; - u32 m_configScreenLblTVY; - u32 m_configScreenLblTVYVal; - u32 m_configScreenBtnTVYM; - u32 m_configScreenBtnTVYP; - u32 m_configScreenLblUser[4]; + u16 m_config3LblOcarina; + u16 m_config3BtnOcarina; + u16 m_config3LblAsyncNet; + u16 m_config3BtnAsyncNet; + u16 m_config3LblUser[4]; + u16 m_config4LblReturnTo; + u16 m_config4LblReturnToVal; + u16 m_config4BtnReturnToM; + u16 m_config4BtnReturnToP; + u16 m_config4LblHome; + u16 m_config4BtnHome; + u16 m_config4LblSaveFavMode; + u16 m_config4BtnSaveFavMode; + u16 m_config4LblCategoryOnBoot; + u16 m_config4BtnCategoryOnBoot; + u16 m_config4LblUser[4]; + u16 m_configSndLblBnrVol; + u16 m_configSndLblBnrVolVal; + u16 m_configSndBtnBnrVolP; + u16 m_configSndBtnBnrVolM; + u16 m_configSndLblMusicVol; + u16 m_configSndLblMusicVolVal; + u16 m_configSndBtnMusicVolP; + u16 m_configSndBtnMusicVolM; + u16 m_configSndLblGuiVol; + u16 m_configSndLblGuiVolVal; + u16 m_configSndBtnGuiVolP; + u16 m_configSndBtnGuiVolM; + u16 m_configSndLblCFVol; + u16 m_configSndLblCFVolVal; + u16 m_configSndBtnCFVolP; + u16 m_configSndBtnCFVolM; + u16 m_configSndLblUser[4]; + u16 m_configScreenLblTVHeight; + u16 m_configScreenLblTVHeightVal; + u16 m_configScreenBtnTVHeightP; + u16 m_configScreenBtnTVHeightM; + u16 m_configScreenLblTVWidth; + u16 m_configScreenLblTVWidthVal; + u16 m_configScreenBtnTVWidthP; + u16 m_configScreenBtnTVWidthM; + u16 m_configScreenLblTVX; + u16 m_configScreenLblTVXVal; + u16 m_configScreenBtnTVXM; + u16 m_configScreenBtnTVXP; + u16 m_configScreenLblTVY; + u16 m_configScreenLblTVYVal; + u16 m_configScreenBtnTVYM; + u16 m_configScreenBtnTVYP; + u16 m_configScreenLblUser[4]; //Download menu enum CoverPrio { @@ -305,27 +305,27 @@ private: FLAT, CFLAT, }; - u32 m_downloadPrioVal; - u32 m_downloadLblTitle; - u32 m_downloadPBar; - u32 m_downloadBtnCancel; - u32 m_downloadBtnAll; - u32 m_downloadBtnMissing; - u32 m_downloadBtnGameTDBDownload; - u32 m_downloadLblGameTDBDownload; - u32 m_downloadLblMessage[2]; - u32 m_downloadLblCovers; - u32 m_downloadLblGameTDB; - u32 m_downloadLblUser[4]; - u32 m_downloadLblCoverPrio; - u32 m_downloadLblPrio; - u32 m_downloadBtnPrioM; - u32 m_downloadBtnPrioP; - u32 m_downloadBtnVersion; - u32 m_downloadLblCoverSet; - u32 m_downloadBtnCoverSet; - u32 m_downloadLblSetTitle; - u32 m_downloadLblRegion; + u16 m_downloadPrioVal; + u16 m_downloadLblTitle; + u16 m_downloadPBar; + u16 m_downloadBtnCancel; + u16 m_downloadBtnAll; + u16 m_downloadBtnMissing; + u16 m_downloadBtnGameTDBDownload; + u16 m_downloadLblGameTDBDownload; + u16 m_downloadLblMessage[2]; + u16 m_downloadLblCovers; + u16 m_downloadLblGameTDB; + u16 m_downloadLblUser[4]; + u16 m_downloadLblCoverPrio; + u16 m_downloadLblPrio; + u16 m_downloadBtnPrioM; + u16 m_downloadBtnPrioP; + u16 m_downloadBtnVersion; + u16 m_downloadLblCoverSet; + u16 m_downloadBtnCoverSet; + u16 m_downloadLblSetTitle; + u16 m_downloadLblRegion; enum Regions { EN = 1, @@ -341,31 +341,31 @@ private: ZHCN, AU, }; - u32 m_downloadBtnEN; - u32 m_downloadBtnJA; - u32 m_downloadBtnFR; - u32 m_downloadBtnDE; - u32 m_downloadBtnES; - u32 m_downloadBtnIT; - u32 m_downloadBtnNL; - u32 m_downloadBtnPT; - u32 m_downloadBtnRU; - u32 m_downloadBtnKO; - u32 m_downloadBtnZHCN; - u32 m_downloadBtnAU; - u32 m_downloadBtnENs; - u32 m_downloadBtnJAs; - u32 m_downloadBtnFRs; - u32 m_downloadBtnDEs; - u32 m_downloadBtnESs; - u32 m_downloadBtnITs; - u32 m_downloadBtnNLs; - u32 m_downloadBtnPTs; - u32 m_downloadBtnRUs; - u32 m_downloadBtnKOs; - u32 m_downloadBtnZHCNs; - u32 m_downloadBtnAUs; - u32 m_downloadBtnBack; + u16 m_downloadBtnEN; + u16 m_downloadBtnJA; + u16 m_downloadBtnFR; + u16 m_downloadBtnDE; + u16 m_downloadBtnES; + u16 m_downloadBtnIT; + u16 m_downloadBtnNL; + u16 m_downloadBtnPT; + u16 m_downloadBtnRU; + u16 m_downloadBtnKO; + u16 m_downloadBtnZHCN; + u16 m_downloadBtnAU; + u16 m_downloadBtnENs; + u16 m_downloadBtnJAs; + u16 m_downloadBtnFRs; + u16 m_downloadBtnDEs; + u16 m_downloadBtnESs; + u16 m_downloadBtnITs; + u16 m_downloadBtnNLs; + u16 m_downloadBtnPTs; + u16 m_downloadBtnRUs; + u16 m_downloadBtnKOs; + u16 m_downloadBtnZHCNs; + u16 m_downloadBtnAUs; + u16 m_downloadBtnBack; static s8 _versionDownloaderInit(CMenu *m); static s8 _versionTxtDownloaderInit(CMenu *m); s8 _versionDownloader(); @@ -377,187 +377,187 @@ private: LOAD_IOS_SUCCEEDED, LOAD_IOS_NOT_NEEDED }; - u32 m_gameLblInfo; - u32 m_gameBtnFavoriteOn; - u32 m_gameBtnFavoriteOff; - u32 m_gameBtnAdultOn; - u32 m_gameBtnAdultOff; - u32 m_gameBtnPlay; - u32 m_gameBtnDelete; - u32 m_gameBtnSettings; - u32 m_gameBtnBack; - u32 m_gameLblUser[4]; + u16 m_gameLblInfo; + u16 m_gameBtnFavoriteOn; + u16 m_gameBtnFavoriteOff; + u16 m_gameBtnAdultOn; + u16 m_gameBtnAdultOff; + u16 m_gameBtnPlay; + u16 m_gameBtnDelete; + u16 m_gameBtnSettings; + u16 m_gameBtnBack; + u16 m_gameLblUser[4]; // Parental code menu - u32 m_codeLblTitle; - u32 m_codeBtnKey[10]; - u32 m_codeBtnBack; - u32 m_codeBtnErase; - u32 m_codeBtnAge; - u32 m_codeLblAge; - u32 m_codeLblUser[4]; + u16 m_codeLblTitle; + u16 m_codeBtnKey[10]; + u16 m_codeBtnBack; + u16 m_codeBtnErase; + u16 m_codeBtnAge; + u16 m_codeLblAge; + u16 m_codeLblUser[4]; //menu_wbfs - u32 m_wbfsLblTitle; - u32 m_wbfsPBar; - u32 m_wbfsBtnBack; - u32 m_wbfsBtnGo; - u32 m_wbfsLblDialog; - u32 m_wbfsLblMessage; - u32 m_wbfsLblUser[4]; + u16 m_wbfsLblTitle; + u16 m_wbfsPBar; + u16 m_wbfsBtnBack; + u16 m_wbfsBtnGo; + u16 m_wbfsLblDialog; + u16 m_wbfsLblMessage; + u16 m_wbfsLblUser[4]; //Theme Adjust menus - u32 m_cfThemeBtnAlt; - u32 m_cfThemeBtnSelect; - u32 m_cfThemeBtnWide; - u32 m_cfThemeLblParam; - u32 m_cfThemeBtnParamM; - u32 m_cfThemeBtnParamP; - u32 m_cfThemeBtnCopy; - u32 m_cfThemeBtnPaste; - u32 m_cfThemeBtnSave; - u32 m_cfThemeBtnCancel; - u32 m_cfThemeLblVal[4 * 4]; - u32 m_cfThemeBtnValM[4 * 4]; - u32 m_cfThemeBtnValP[4 * 4]; - u32 m_cfThemeLblValTxt[4]; + u16 m_cfThemeBtnAlt; + u16 m_cfThemeBtnSelect; + u16 m_cfThemeBtnWide; + u16 m_cfThemeLblParam; + u16 m_cfThemeBtnParamM; + u16 m_cfThemeBtnParamP; + u16 m_cfThemeBtnCopy; + u16 m_cfThemeBtnPaste; + u16 m_cfThemeBtnSave; + u16 m_cfThemeBtnCancel; + u16 m_cfThemeLblVal[4 * 4]; + u16 m_cfThemeBtnValM[4 * 4]; + u16 m_cfThemeBtnValP[4 * 4]; + u16 m_cfThemeLblValTxt[4]; //Game Settings menus - u32 m_gameSettingsLblPage; - u32 m_gameSettingsBtnPageM; - u32 m_gameSettingsBtnPageP; - u32 m_gameSettingsBtnBack; - u32 m_gameSettingsLblTitle; - u32 m_gameSettingsLblGameLanguage; - u32 m_gameSettingsLblLanguage; - u32 m_gameSettingsBtnLanguageP; - u32 m_gameSettingsBtnLanguageM; - u32 m_gameSettingsLblGameVideo; - u32 m_gameSettingsLblVideo; - u32 m_gameSettingsBtnVideoP; - u32 m_gameSettingsBtnVideoM; + u16 m_gameSettingsLblPage; + u16 m_gameSettingsBtnPageM; + u16 m_gameSettingsBtnPageP; + u16 m_gameSettingsBtnBack; + u16 m_gameSettingsLblTitle; + u16 m_gameSettingsLblGameLanguage; + u16 m_gameSettingsLblLanguage; + u16 m_gameSettingsBtnLanguageP; + u16 m_gameSettingsBtnLanguageM; + u16 m_gameSettingsLblGameVideo; + u16 m_gameSettingsLblVideo; + u16 m_gameSettingsBtnVideoP; + u16 m_gameSettingsBtnVideoM; - u32 m_gameSettingsLblDMLGameVideo; - u32 m_gameSettingsLblDMLVideo; - u32 m_gameSettingsBtnDMLVideoP; - u32 m_gameSettingsBtnDMLVideoM; + u16 m_gameSettingsLblDMLGameVideo; + u16 m_gameSettingsLblDMLVideo; + u16 m_gameSettingsBtnDMLVideoP; + u16 m_gameSettingsBtnDMLVideoM; - u32 m_gameSettingsLblGClanguageVal; - u32 m_gameSettingsLblGClanguage; - u32 m_gameSettingsBtnGClanguageP; - u32 m_gameSettingsBtnGClanguageM; + u16 m_gameSettingsLblGClanguageVal; + u16 m_gameSettingsLblGClanguage; + u16 m_gameSettingsBtnGClanguageP; + u16 m_gameSettingsBtnGClanguageM; - u32 m_gameSettingsLblIOSreloadBlock; - u32 m_gameSettingsBtnIOSreloadBlock; + u16 m_gameSettingsLblIOSreloadBlock; + u16 m_gameSettingsBtnIOSreloadBlock; - u32 m_gameSettingsLblAspectRatio; - u32 m_gameSettingsLblAspectRatioVal; - u32 m_gameSettingsBtnAspectRatioP; - u32 m_gameSettingsBtnAspectRatioM; + u16 m_gameSettingsLblAspectRatio; + u16 m_gameSettingsLblAspectRatioVal; + u16 m_gameSettingsBtnAspectRatioP; + u16 m_gameSettingsBtnAspectRatioM; - u32 m_gameSettingsLblNMM; - u32 m_gameSettingsLblNMM_Val; - u32 m_gameSettingsBtnNMM_P; - u32 m_gameSettingsBtnNMM_M; + u16 m_gameSettingsLblNMM; + u16 m_gameSettingsLblNMM_Val; + u16 m_gameSettingsBtnNMM_P; + u16 m_gameSettingsBtnNMM_M; - u32 m_gameSettingsLblNoDVD; - u32 m_gameSettingsLblNoDVD_Val; - u32 m_gameSettingsBtnNoDVD_P; - u32 m_gameSettingsBtnNoDVD_M; + u16 m_gameSettingsLblNoDVD; + u16 m_gameSettingsLblNoDVD_Val; + u16 m_gameSettingsBtnNoDVD_P; + u16 m_gameSettingsBtnNoDVD_M; - u32 m_gameSettingsLblCustom; - u32 m_gameSettingsBtnCustom; + u16 m_gameSettingsLblCustom; + u16 m_gameSettingsBtnCustom; - u32 m_gameSettingsLblOcarina; - u32 m_gameSettingsBtnOcarina; - u32 m_gameSettingsLblVipatch; - u32 m_gameSettingsBtnVipatch; - u32 m_gameSettingsLblCountryPatch; - u32 m_gameSettingsBtnCountryPatch; - u32 m_gameSettingsLblCover; - u32 m_gameSettingsBtnCover; - u32 m_gameSettingsLblPatchVidModes; - u32 m_gameSettingsLblPatchVidModesVal; - u32 m_gameSettingsBtnPatchVidModesM; - u32 m_gameSettingsBtnPatchVidModesP; - u32 m_gameSettingsLblUser[3 * 2]; - u32 m_gameSettingsLblHooktype; - u32 m_gameSettingsLblHooktypeVal; - u32 m_gameSettingsBtnHooktypeM; - u32 m_gameSettingsBtnHooktypeP; - u32 m_gameSettingsLblEmulationVal; - u32 m_gameSettingsBtnEmulationP; - u32 m_gameSettingsBtnEmulationM; - u32 m_gameSettingsLblEmulation; - u32 m_gameSettingsLblDebugger; - u32 m_gameSettingsLblDebuggerV; - u32 m_gameSettingsBtnDebuggerP; - u32 m_gameSettingsBtnDebuggerM; - u32 m_gameSettingsLblCheat; - u32 m_gameSettingsBtnCheat; - u32 m_gameSettingsLblCategoryMain; - u32 m_gameSettingsBtnCategoryMain; - u32 m_gameSettingsPage; - u32 m_gameSettingsLblGameIOS; - u32 m_gameSettingsLblIOS; - u32 m_gameSettingsBtnIOSP; - u32 m_gameSettingsBtnIOSM; - u32 m_gameSettingsLblExtractSave; - u32 m_gameSettingsBtnExtractSave; - u32 m_gameSettingsLblFlashSave; - u32 m_gameSettingsBtnFlashSave; + u16 m_gameSettingsLblOcarina; + u16 m_gameSettingsBtnOcarina; + u16 m_gameSettingsLblVipatch; + u16 m_gameSettingsBtnVipatch; + u16 m_gameSettingsLblCountryPatch; + u16 m_gameSettingsBtnCountryPatch; + u16 m_gameSettingsLblCover; + u16 m_gameSettingsBtnCover; + u16 m_gameSettingsLblPatchVidModes; + u16 m_gameSettingsLblPatchVidModesVal; + u16 m_gameSettingsBtnPatchVidModesM; + u16 m_gameSettingsBtnPatchVidModesP; + u16 m_gameSettingsLblUser[3 * 2]; + u16 m_gameSettingsLblHooktype; + u16 m_gameSettingsLblHooktypeVal; + u16 m_gameSettingsBtnHooktypeM; + u16 m_gameSettingsBtnHooktypeP; + u16 m_gameSettingsLblEmulationVal; + u16 m_gameSettingsBtnEmulationP; + u16 m_gameSettingsBtnEmulationM; + u16 m_gameSettingsLblEmulation; + u16 m_gameSettingsLblDebugger; + u16 m_gameSettingsLblDebuggerV; + u16 m_gameSettingsBtnDebuggerP; + u16 m_gameSettingsBtnDebuggerM; + u16 m_gameSettingsLblCheat; + u16 m_gameSettingsBtnCheat; + u16 m_gameSettingsLblCategoryMain; + u16 m_gameSettingsBtnCategoryMain; + u16 m_gameSettingsPage; + u16 m_gameSettingsLblGameIOS; + u16 m_gameSettingsLblIOS; + u16 m_gameSettingsBtnIOSP; + u16 m_gameSettingsBtnIOSM; + u16 m_gameSettingsLblExtractSave; + u16 m_gameSettingsBtnExtractSave; + u16 m_gameSettingsLblFlashSave; + u16 m_gameSettingsBtnFlashSave; // System Menu - u32 m_systemBtnBack; - u32 m_systemLblTitle; - u32 m_systemLblVersionTxt; - u32 m_systemLblVersion; - u32 m_systemLblVersionRev; - u32 m_systemLblUser[4]; - u32 m_systemBtnDownload; - u32 m_systemLblInfo; - u32 m_systemLblVerSelectVal; - u32 m_systemBtnVerSelectM; - u32 m_systemBtnVerSelectP; + u16 m_systemBtnBack; + u16 m_systemLblTitle; + u16 m_systemLblVersionTxt; + u16 m_systemLblVersion; + u16 m_systemLblVersionRev; + u16 m_systemLblUser[4]; + u16 m_systemBtnDownload; + u16 m_systemLblInfo; + u16 m_systemLblVerSelectVal; + u16 m_systemBtnVerSelectM; + u16 m_systemBtnVerSelectP; //Cheat menu - u32 m_cheatBtnBack; - u32 m_cheatBtnApply; - u32 m_cheatBtnDownload; - u32 m_cheatLblTitle; - u32 m_cheatLblPage; - u32 m_cheatBtnPageM; - u32 m_cheatBtnPageP; - u32 m_cheatLblItem[4]; - u32 m_cheatBtnItem[4]; - u32 m_cheatSettingsPage; - u32 m_cheatLblUser[4]; + u16 m_cheatBtnBack; + u16 m_cheatBtnApply; + u16 m_cheatBtnDownload; + u16 m_cheatLblTitle; + u16 m_cheatLblPage; + u16 m_cheatBtnPageM; + u16 m_cheatBtnPageP; + u16 m_cheatLblItem[4]; + u16 m_cheatBtnItem[4]; + u16 m_cheatSettingsPage; + u16 m_cheatLblUser[4]; STexture m_cheatBg; GCTCheats m_cheatfile; // Gameinfo menu - u32 m_gameinfoLblTitle; - u32 m_gameinfoLblID; - u32 m_gameinfoLblSynopsis; - u32 m_gameinfoLblDev; - u32 m_gameinfoLblRegion; - u32 m_gameinfoLblPublisher; - u32 m_gameinfoLblRlsdate; - u32 m_gameinfoLblGenre; - u32 m_gameinfoLblRating; - u32 m_gameinfoLblWifiplayers; - u32 m_gameinfoLblUser[5]; - u32 m_gameinfoLblControlsReq[4]; - u32 m_gameinfoLblControls[4]; + u16 m_gameinfoLblTitle; + u16 m_gameinfoLblID; + u16 m_gameinfoLblSynopsis; + u16 m_gameinfoLblDev; + u16 m_gameinfoLblRegion; + u16 m_gameinfoLblPublisher; + u16 m_gameinfoLblRlsdate; + u16 m_gameinfoLblGenre; + u16 m_gameinfoLblRating; + u16 m_gameinfoLblWifiplayers; + u16 m_gameinfoLblUser[5]; + u16 m_gameinfoLblControlsReq[4]; + u16 m_gameinfoLblControls[4]; STexture m_gameinfoBg; STexture m_rating; STexture m_wifi; STexture m_controlsreq[4]; STexture m_controls[4]; // Category menu - u32 m_categoryLblPage; - u32 m_categoryBtnPageM; - u32 m_categoryBtnPageP; - u32 m_categoryBtnBack; - u32 m_categoryLblTitle; - u32 m_categoryLblCat[21]; - u32 m_categoryBtn[21]; - u32 m_categoryBtnCat[21]; - u32 m_categoryBtnCats[21]; - u32 m_categoryLblUser[4]; + u16 m_categoryLblPage; + u16 m_categoryBtnPageM; + u16 m_categoryBtnPageP; + u16 m_categoryBtnBack; + u16 m_categoryLblTitle; + u16 m_categoryLblCat[21]; + u16 m_categoryBtn[21]; + u16 m_categoryBtnCat[21]; + u16 m_categoryBtnCats[21]; + u16 m_categoryLblUser[4]; u8 m_max_categories; // NandEmulation string m_saveExtGameId; @@ -1006,17 +1006,17 @@ private: SmartGuiSound _sound(CMenu::SoundSet &soundSet, const char *domain, const char *key, const u8 * snd, u32 len, string name, bool isAllocated); SmartGuiSound _sound(CMenu::SoundSet &soundSet, const char *domain, const char *key, string name); u16 _textStyle(const char *domain, const char *key, u16 def); - u32 _addButton(SThemeData &theme, const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color); - u32 _addSelButton(SThemeData &theme, const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color); - u32 _addPicButton(SThemeData &theme, const char *domain, STexture &texNormal, STexture &texSelected, int x, int y, u32 width, u32 height); - u32 _addTitle(SThemeData &theme, const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, u16 style); - u32 _addText(SThemeData &theme, const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, u16 style); - u32 _addLabel(SThemeData &theme, const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, u16 style); - u32 _addLabel(SThemeData &theme, const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, u16 style, STexture &bg); - u32 _addProgressBar(SThemeData &theme, const char *domain, int x, int y, u32 width, u32 height); - void _setHideAnim(u32 id, const char *domain, int dx, int dy, float scaleX, float scaleY); - void _addUserLabels(CMenu::SThemeData &theme, u32 *ids, u32 size, const char *domain); - void _addUserLabels(CMenu::SThemeData &theme, u32 *ids, u32 start, u32 size, const char *domain); + u16 _addButton(SThemeData &theme, const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color); + u16 _addSelButton(SThemeData &theme, const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color); + u16 _addPicButton(SThemeData &theme, const char *domain, STexture &texNormal, STexture &texSelected, int x, int y, u32 width, u32 height); + u16 _addTitle(SThemeData &theme, const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, u16 style); + u16 _addText(SThemeData &theme, const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, u16 style); + u16 _addLabel(SThemeData &theme, const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, u16 style); + u16 _addLabel(SThemeData &theme, const char *domain, SFont font, const wstringEx &text, int x, int y, u32 width, u32 height, const CColor &color, u16 style, STexture &bg); + u16 _addProgressBar(SThemeData &theme, const char *domain, int x, int y, u32 width, u32 height); + void _setHideAnim(u16 id, const char *domain, int dx, int dy, float scaleX, float scaleY); + void _addUserLabels(CMenu::SThemeData &theme, u16 *ids, u32 size, const char *domain); + void _addUserLabels(CMenu::SThemeData &theme, u16 *ids, u32 start, u32 size, const char *domain); // const wstringEx _t(const char *key, const wchar_t *def = L"") { return m_loc.getWString(m_curLanguage, key, def); } const wstringEx _fmt(const char *key, const wchar_t *def); diff --git a/source/menu/menu_about.cpp b/source/menu/menu_about.cpp index 30fbc0d9..678769ef 100644 --- a/source/menu/menu_about.cpp +++ b/source/menu/menu_about.cpp @@ -13,10 +13,10 @@ const int pixels_to_skip = 10; extern const u8 english_txt[]; //About menu -u32 m_aboutLblTitle; -u32 m_aboutLblInfo; -u32 m_aboutLblUser[4]; -u32 m_aboutLblIOS; +u16 m_aboutLblTitle; +u16 m_aboutLblInfo; +u16 m_aboutLblUser[4]; +u16 m_aboutLblIOS; void CMenu::_about(void) { @@ -74,9 +74,9 @@ void CMenu::_hideAbout(bool instant) m_btnMgr.hide(m_aboutLblTitle, instant); m_btnMgr.hide(m_aboutLblIOS, instant); m_btnMgr.hide(m_aboutLblInfo, instant); - for (u32 i = 0; i < ARRAY_SIZE(m_aboutLblUser); ++i) + for (u8 i = 0; i < ARRAY_SIZE(m_aboutLblUser); ++i) { - if (m_aboutLblUser[i] != -1u) + if(m_aboutLblUser[i] != (u16)-1) m_btnMgr.hide(m_aboutLblUser[i], instant); } } @@ -87,9 +87,9 @@ void CMenu::_showAbout(void) m_btnMgr.show(m_aboutLblTitle); m_btnMgr.show(m_aboutLblIOS); m_btnMgr.show(m_aboutLblInfo,false); - for (u32 i = 0; i < ARRAY_SIZE(m_aboutLblUser); ++i) + for(u8 i = 0; i < ARRAY_SIZE(m_aboutLblUser); ++i) { - if (m_aboutLblUser[i] != -1u) + if(m_aboutLblUser[i] != (u16)-1) m_btnMgr.show(m_aboutLblUser[i]); } } diff --git a/source/menu/menu_categories.cpp b/source/menu/menu_categories.cpp index f672e158..b6ddcbc2 100644 --- a/source/menu/menu_categories.cpp +++ b/source/menu/menu_categories.cpp @@ -15,9 +15,9 @@ void CMenu::_hideCategorySettings(bool instant) m_btnMgr.hide(m_categoryLblPage, instant); m_btnMgr.hide(m_categoryBtnPageM, instant); m_btnMgr.hide(m_categoryBtnPageP, instant); - for(u32 i = 0; i < ARRAY_SIZE(m_categoryLblUser); ++i) + for(u8 i = 0; i < ARRAY_SIZE(m_categoryLblUser); ++i) { - if(m_categoryLblUser[i] != -1u) + if(m_categoryLblUser[i] != (u16)-1u) m_btnMgr.hide(m_categoryLblUser[i], instant); } @@ -25,16 +25,16 @@ void CMenu::_hideCategorySettings(bool instant) { m_btnMgr.hide(m_categoryLblCat[i]); m_btnMgr.hide(m_categoryBtnCat[i]); - m_btnMgr.hide(m_categoryBtnCats[i]); + m_btnMgr.hide(m_categoryBtnCats[i]); } } void CMenu::_showCategorySettings(void) { _setBg(m_categoryBg, m_categoryBg); - for(u32 i = 0; i < ARRAY_SIZE(m_categoryLblUser); ++i) + for(u8 i = 0; i < ARRAY_SIZE(m_categoryLblUser); ++i) { - if(m_categoryLblUser[i] != -1u) + if(m_categoryLblUser[i] != (u16)-1) m_btnMgr.show(m_categoryLblUser[i]); } m_btnMgr.show(m_categoryLblTitle); @@ -51,7 +51,7 @@ void CMenu::_updateCheckboxes(void) m_btnMgr.show(m_categoryBtnPageM); m_btnMgr.show(m_categoryBtnPageP); } - for(int i = 0; i < 21; ++i) + for(u8 i = 0; i < 21; ++i) { m_btnMgr.hide(m_categoryBtnCat[i]); m_btnMgr.hide(m_categoryBtnCats[i]); diff --git a/source/menu/menu_cheat.cpp b/source/menu/menu_cheat.cpp index 1d73c17a..8d2c2364 100644 --- a/source/menu/menu_cheat.cpp +++ b/source/menu/menu_cheat.cpp @@ -277,8 +277,8 @@ void CMenu::_hideCheatSettings(bool instant) m_btnMgr.hide(m_cheatLblItem[i], instant); } - for (u32 i = 0; i < ARRAY_SIZE(m_cheatLblUser); ++i) - if (m_cheatLblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_cheatLblUser); ++i) + if(m_cheatLblUser[i] != (u16)-1) m_btnMgr.hide(m_cheatLblUser[i], instant); } @@ -288,8 +288,8 @@ void CMenu::_showCheatSettings(void) m_btnMgr.show(m_cheatBtnBack); m_btnMgr.show(m_cheatLblTitle); - for (u32 i = 0; i < ARRAY_SIZE(m_cheatLblUser); ++i) - if (m_cheatLblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_cheatLblUser); ++i) + if(m_cheatLblUser[i] != (u16)-1) m_btnMgr.show(m_cheatLblUser[i]); if (m_cheatfile.getCnt() > 0) diff --git a/source/menu/menu_code.cpp b/source/menu/menu_code.cpp index 54c041b3..1258e7b2 100644 --- a/source/menu/menu_code.cpp +++ b/source/menu/menu_code.cpp @@ -7,14 +7,14 @@ extern const u8 deletes_png[]; void CMenu::_hideCode(bool instant) { - for (int i = 0; i < 10; ++i) + for(u8 i = 0; i < 10; ++i) m_btnMgr.hide(m_codeBtnKey[i], instant); m_btnMgr.hide(m_codeBtnBack, instant); m_btnMgr.hide(m_codeBtnErase, instant); m_btnMgr.hide(m_codeBtnAge, instant); m_btnMgr.hide(m_codeLblTitle, instant); - for (u32 i = 0; i < ARRAY_SIZE(m_codeLblUser); ++i) - if (m_codeLblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_codeLblUser); ++i) + if(m_codeLblUser[i] != (u16)-1) m_btnMgr.hide(m_codeLblUser[i], instant); m_btnMgr.hide(m_codeLblAge, true); } @@ -22,12 +22,12 @@ void CMenu::_hideCode(bool instant) void CMenu::_showCode(void) { _setBg(m_codeBg, m_codeBg); - for (int i = 0; i < 10; ++i) + for(u8 i = 0; i < 10; ++i) m_btnMgr.show(m_codeBtnKey[i]); m_btnMgr.show(m_codeBtnBack); m_btnMgr.show(m_codeLblTitle); - for (u32 i = 0; i < ARRAY_SIZE(m_codeLblUser); ++i) - if (m_codeLblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_codeLblUser); ++i) + if(m_codeLblUser[i] != (u16)-1) m_btnMgr.show(m_codeLblUser[i]); m_btnMgr.hide(m_codeLblAge, true); } diff --git a/source/menu/menu_config.cpp b/source/menu/menu_config.cpp index 5bb23a8f..c6b3f67c 100644 --- a/source/menu/menu_config.cpp +++ b/source/menu/menu_config.cpp @@ -33,8 +33,8 @@ void CMenu::_hideConfig(bool instant) m_btnMgr.hide(m_configBtnSetCode, instant); m_btnMgr.hide(m_configLblCfg4, instant); m_btnMgr.hide(m_configBtnCfg4, instant); - for (u32 i = 0; i < ARRAY_SIZE(m_configLblUser); ++i) - if (m_configLblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_configLblUser); ++i) + if(m_configLblUser[i] != (u16)-1) m_btnMgr.hide(m_configLblUser[i], instant); } @@ -68,8 +68,8 @@ void CMenu::_showConfig(void) for(u8 i = 0; strncmp((const char *)&partitionname[i], "\0", 1) != 0; i++) partitionname[i] = toupper(partitionname[i]); - for (u32 i = 0; i < ARRAY_SIZE(m_configLblUser); ++i) - if (m_configLblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_configLblUser); ++i) + if(m_configLblUser[i] != (u16)-1) m_btnMgr.show(m_configLblUser[i]); m_btnMgr.setText(m_configLblPartition, (string)partitionname); diff --git a/source/menu/menu_config3.cpp b/source/menu/menu_config3.cpp index 4c886c70..a0b9bc1e 100644 --- a/source/menu/menu_config3.cpp +++ b/source/menu/menu_config3.cpp @@ -41,8 +41,8 @@ void CMenu::_hideConfig3(bool instant) m_btnMgr.hide(m_config3BtnAsyncNet, instant); m_btnMgr.hide(m_config3LblOcarina, instant); m_btnMgr.hide(m_config3BtnOcarina, instant); - for (u32 i = 0; i < ARRAY_SIZE(m_config3LblUser); ++i) - if (m_config3LblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_config3LblUser); ++i) + if(m_config3LblUser[i] != (u16)-1) m_btnMgr.hide(m_config3LblUser[i], instant); } @@ -77,8 +77,8 @@ void CMenu::_showConfig3(void) m_btnMgr.show(m_config3LblOcarina); m_btnMgr.show(m_config3BtnOcarina); - for (u32 i = 0; i < ARRAY_SIZE(m_config3LblUser); ++i) - if (m_config3LblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_config3LblUser); ++i) + if(m_config3LblUser[i] != (u16)-1) m_btnMgr.show(m_config3LblUser[i]); int i; diff --git a/source/menu/menu_config4.cpp b/source/menu/menu_config4.cpp index 5f3fcf05..fc11197f 100644 --- a/source/menu/menu_config4.cpp +++ b/source/menu/menu_config4.cpp @@ -41,8 +41,8 @@ void CMenu::_hideConfig4(bool instant) m_btnMgr.hide(m_config4LblReturnToVal, instant); m_btnMgr.hide(m_config4BtnReturnToM, instant); m_btnMgr.hide(m_config4BtnReturnToP, instant); - for (u32 i = 0; i < ARRAY_SIZE(m_config4LblUser); ++i) - if (m_config4LblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_config4LblUser); ++i) + if(m_config4LblUser[i] != (u16)-1) m_btnMgr.hide(m_config4LblUser[i], instant); } @@ -61,8 +61,8 @@ void CMenu::_showConfig4(void) m_btnMgr.show(m_config4BtnReturnToM); m_btnMgr.show(m_config4BtnReturnToP); - for (u32 i = 0; i < ARRAY_SIZE(m_config4LblUser); ++i) - if (m_config4LblUser[i] != -1u) + for(u32 i = 0; i < ARRAY_SIZE(m_config4LblUser); ++i) + if(m_config4LblUser[i] != (u16)-1) m_btnMgr.show(m_config4LblUser[i]); int i; diff --git a/source/menu/menu_config_adv.cpp b/source/menu/menu_config_adv.cpp index a2638252..813e9a2b 100644 --- a/source/menu/menu_config_adv.cpp +++ b/source/menu/menu_config_adv.cpp @@ -33,8 +33,8 @@ void CMenu::_hideConfigAdv(bool instant) m_btnMgr.hide(m_configAdvBtnCurLanguageP, instant); m_btnMgr.hide(m_configAdvLblCFTheme, instant); m_btnMgr.hide(m_configAdvBtnCFTheme, instant); - for (u32 i = 0; i < ARRAY_SIZE(m_configAdvLblUser); ++i) - if (m_configAdvLblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_configAdvLblUser); ++i) + if(m_configAdvLblUser[i] != (u16)-1) m_btnMgr.hide(m_configAdvLblUser[i], instant); } @@ -57,8 +57,8 @@ void CMenu::_showConfigAdv(void) m_btnMgr.show(m_configAdvLblCFTheme); m_btnMgr.show(m_configAdvBtnCFTheme); } - for (u32 i = 0; i < ARRAY_SIZE(m_configAdvLblUser); ++i) - if (m_configAdvLblUser[i] != -1u) + for(u32 i = 0; i < ARRAY_SIZE(m_configAdvLblUser); ++i) + if(m_configAdvLblUser[i] != (u16)-1) m_btnMgr.show(m_configAdvLblUser[i]); m_btnMgr.setText(m_configAdvLblCurLanguage, m_curLanguage); diff --git a/source/menu/menu_config_game.cpp b/source/menu/menu_config_game.cpp index 5a6b5651..6673b256 100644 --- a/source/menu/menu_config_game.cpp +++ b/source/menu/menu_config_game.cpp @@ -89,8 +89,8 @@ void CMenu::_hideGameSettings(bool instant) m_btnMgr.hide(m_gameSettingsLblFlashSave, instant); m_btnMgr.hide(m_gameSettingsBtnFlashSave, instant); - for (u32 i = 0; i < ARRAY_SIZE(m_gameSettingsLblUser); ++i) - if (m_gameSettingsLblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_gameSettingsLblUser); ++i) + if(m_gameSettingsLblUser[i] != (u16)-1) m_btnMgr.hide(m_gameSettingsLblUser[i], instant); } @@ -361,10 +361,10 @@ void CMenu::_showGameSettings(void) m_btnMgr.hide(m_gameSettingsLblFlashSave); m_btnMgr.hide(m_gameSettingsBtnFlashSave); } - + u32 i = 0; - for (i = 0; i < ARRAY_SIZE(m_gameSettingsLblUser); ++i) - if (m_gameSettingsLblUser[i] != -1u) + for(i = 0; i < ARRAY_SIZE(m_gameSettingsLblUser); ++i) + if(m_gameSettingsLblUser[i] != (u16)-1) m_btnMgr.show(m_gameSettingsLblUser[i]); string id(m_cf.getId()); diff --git a/source/menu/menu_config_screen.cpp b/source/menu/menu_config_screen.cpp index 01d1c8a5..418cfc5e 100644 --- a/source/menu/menu_config_screen.cpp +++ b/source/menu/menu_config_screen.cpp @@ -23,8 +23,8 @@ void CMenu::_hideConfigScreen(bool instant) m_btnMgr.hide(m_configScreenLblTVYVal, instant); m_btnMgr.hide(m_configScreenBtnTVYM, instant); m_btnMgr.hide(m_configScreenBtnTVYP, instant); - for (u32 i = 0; i < ARRAY_SIZE(m_configScreenLblUser); ++i) - if (m_configScreenLblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_configScreenLblUser); ++i) + if(m_configScreenLblUser[i] != (u16)-1) m_btnMgr.hide(m_configScreenLblUser[i], instant); } @@ -48,8 +48,8 @@ void CMenu::_showConfigScreen(void) m_btnMgr.show(m_configScreenLblTVYVal); m_btnMgr.show(m_configScreenBtnTVYM); m_btnMgr.show(m_configScreenBtnTVYP); - for (u32 i = 0; i < ARRAY_SIZE(m_configScreenLblUser); ++i) - if (m_configScreenLblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_configScreenLblUser); ++i) + if(m_configScreenLblUser[i] != (u16)-1) m_btnMgr.show(m_configScreenLblUser[i]); m_btnMgr.setText(m_configScreenLblTVWidthVal, wfmt(L"%i", 640 * 640 / max(1, m_cfg.getInt("GENERAL", "tv_width", 640)))); diff --git a/source/menu/menu_configsnd.cpp b/source/menu/menu_configsnd.cpp index 89a6b937..9b3aab21 100644 --- a/source/menu/menu_configsnd.cpp +++ b/source/menu/menu_configsnd.cpp @@ -23,8 +23,8 @@ void CMenu::_hideConfigSnd(bool instant) m_btnMgr.hide(m_configSndLblCFVolVal, instant); m_btnMgr.hide(m_configSndBtnCFVolP, instant); m_btnMgr.hide(m_configSndBtnCFVolM, instant); - for (u32 i = 0; i < ARRAY_SIZE(m_configSndLblUser); ++i) - if (m_configSndLblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_configSndLblUser); ++i) + if(m_configSndLblUser[i] != (u16)-1) m_btnMgr.hide(m_configSndLblUser[i], instant); } @@ -48,8 +48,8 @@ void CMenu::_showConfigSnd(void) m_btnMgr.show(m_configSndLblCFVolVal); m_btnMgr.show(m_configSndBtnCFVolP); m_btnMgr.show(m_configSndBtnCFVolM); - for (u32 i = 0; i < ARRAY_SIZE(m_configSndLblUser); ++i) - if (m_configSndLblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_configSndLblUser); ++i) + if(m_configSndLblUser[i] != (u16)-1) m_btnMgr.show(m_configSndLblUser[i]); m_btnMgr.setText(m_configSndLblGuiVolVal, wfmt(L"%i", m_cfg.getInt("GENERAL", "sound_volume_gui", 255))); diff --git a/source/menu/menu_download.cpp b/source/menu/menu_download.cpp index cf75713d..4e49cb3d 100644 --- a/source/menu/menu_download.cpp +++ b/source/menu/menu_download.cpp @@ -300,8 +300,8 @@ void CMenu::_hideDownload(bool instant) m_btnMgr.hide(m_downloadLblCovers, instant); m_btnMgr.hide(m_downloadLblGameTDBDownload, instant); m_btnMgr.hide(m_downloadLblGameTDB, instant); - for (u32 i = 0; i < ARRAY_SIZE(m_downloadLblUser); ++i) - if (m_downloadLblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_downloadLblUser); ++i) + if(m_downloadLblUser[i] != (u16)-1) m_btnMgr.hide(m_downloadLblUser[i], instant); } @@ -322,8 +322,8 @@ void CMenu::_showDownload(void) m_btnMgr.show(m_downloadLblGameTDBDownload); m_btnMgr.show(m_downloadBtnGameTDBDownload); } - for (u32 i = 0; i < ARRAY_SIZE(m_downloadLblUser); ++i) - if (m_downloadLblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_downloadLblUser); ++i) + if(m_downloadLblUser[i] != (u16)-1) m_btnMgr.show(m_downloadLblUser[i]); } diff --git a/source/menu/menu_error.cpp b/source/menu/menu_error.cpp index 6934f352..2bbe00c8 100644 --- a/source/menu/menu_error.cpp +++ b/source/menu/menu_error.cpp @@ -3,9 +3,9 @@ #include "gecko.h" extern const u8 error_png[]; -u32 m_errorLblMessage; -u32 m_errorLblIcon; -u32 m_errorLblUser[4]; +u16 m_errorLblMessage; +u16 m_errorLblIcon; +u16 m_errorLblUser[4]; void CMenu::error(const wstringEx &msg) { @@ -44,8 +44,8 @@ void CMenu::_hideError(bool instant) { m_btnMgr.hide(m_errorLblIcon, instant); m_btnMgr.hide(m_errorLblMessage, instant); - for (u32 i = 0; i < ARRAY_SIZE(m_errorLblUser); ++i) - if (m_errorLblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_errorLblUser); ++i) + if(m_errorLblUser[i] != (u16)-1) m_btnMgr.hide(m_errorLblUser[i], instant); } @@ -54,8 +54,8 @@ void CMenu::_showError(void) _setBg(m_errorBg, m_errorBg); m_btnMgr.show(m_errorLblMessage); m_btnMgr.show(m_errorLblIcon); - for (u32 i = 0; i < ARRAY_SIZE(m_errorLblUser); ++i) - if (m_errorLblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_errorLblUser); ++i) + if(m_errorLblUser[i] != (u16)-1) m_btnMgr.show(m_errorLblUser[i]); } diff --git a/source/menu/menu_game.cpp b/source/menu/menu_game.cpp index b5a9394b..d3ea4399 100644 --- a/source/menu/menu_game.cpp +++ b/source/menu/menu_game.cpp @@ -60,10 +60,10 @@ extern int mainIOS; static u64 sm_title_id[8] ATTRIBUTE_ALIGN(32); bool m_zoom_banner = false; -u32 m_gameBtnPlayFull; -u32 m_gameBtnBackFull; -u32 m_gameBtnToogle; -u32 m_gameBtnToogleFull; +u16 m_gameBtnPlayFull; +u16 m_gameBtnBackFull; +u16 m_gameBtnToogle; +u16 m_gameBtnToogleFull; const string CMenu::_translations[23] = { "Default", @@ -324,8 +324,8 @@ void CMenu::_hideGame(bool instant) m_btnMgr.hide(m_gameBtnFavoriteOff, instant); m_btnMgr.hide(m_gameBtnAdultOn, instant); m_btnMgr.hide(m_gameBtnAdultOff, instant); - for (u32 i = 0; i < ARRAY_SIZE(m_gameLblUser); ++i) - if (m_gameLblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_gameLblUser); ++i) + if(m_gameLblUser[i] != (u16)-1) m_btnMgr.hide(m_gameLblUser[i], instant); } @@ -347,9 +347,9 @@ void CMenu::_showGame(void) if(!m_zoom_banner) { - for(u32 i = 0; i < ARRAY_SIZE(m_gameLblUser); ++i) + for(u16 i = 0; i < ARRAY_SIZE(m_gameLblUser); ++i) { - if(m_gameLblUser[i] != -1u) + if(m_gameLblUser[i] != (u16)-1) m_btnMgr.show(m_gameLblUser[i]); } m_btnMgr.show(m_gameBtnPlay); @@ -523,7 +523,7 @@ void CMenu::_game(bool launch) if(!m_gameSound.IsPlaying()) startGameSound = -6; } - else if(launch || m_btnMgr.selected(m_gameBtnPlay) || m_btnMgr.selected(m_gameBtnPlayFull) || (!WPadIR_Valid(0) && !WPadIR_Valid(1) && !WPadIR_Valid(2) && !WPadIR_Valid(3) && m_btnMgr.selected((u32)-1))) + else if(launch || m_btnMgr.selected(m_gameBtnPlay) || m_btnMgr.selected(m_gameBtnPlayFull) || (!WPadIR_Valid(0) && !WPadIR_Valid(1) && !WPadIR_Valid(2) && !WPadIR_Valid(3) && m_btnMgr.selected((u16)-1))) { _hideGame(); dir_discHdr *hdr = m_cf.getHdr(); @@ -632,9 +632,9 @@ void CMenu::_game(bool launch) m_btnMgr.hide(m_gameBtnPlayFull); m_btnMgr.hide(m_gameBtnBackFull); m_btnMgr.hide(m_gameBtnToogleFull); - for(u32 i = 0; i < ARRAY_SIZE(m_gameLblUser); ++i) + for(u8 i = 0; i < ARRAY_SIZE(m_gameLblUser); ++i) { - if(m_gameLblUser[i] != -1u) + if(m_gameLblUser[i] != (u16)-1) m_btnMgr.show(m_gameLblUser[i]); } if(!m_locked) @@ -664,8 +664,8 @@ void CMenu::_game(bool launch) m_btnMgr.hide(m_gameBtnPlay); m_btnMgr.hide(m_gameBtnBack); m_btnMgr.hide(m_gameBtnToogle); - for (u32 i = 0; i < ARRAY_SIZE(m_gameLblUser); ++i) - if (m_gameLblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_gameLblUser); ++i) + if (m_gameLblUser[i] != (u16)-1) m_btnMgr.hide(m_gameLblUser[i]); } } diff --git a/source/menu/menu_gameinfo.cpp b/source/menu/menu_gameinfo.cpp index a2d13beb..bfc6d585 100644 --- a/source/menu/menu_gameinfo.cpp +++ b/source/menu/menu_gameinfo.cpp @@ -129,7 +129,7 @@ void CMenu::_gameinfo(void) { page = 1; amount_of_skips = 0; - + m_btnMgr.reset(m_gameinfoLblSynopsis); m_btnMgr.setText(m_gameinfoLblSynopsis, wfmt(L"%s", gameinfo.Synopsis.c_str())); @@ -142,17 +142,17 @@ void CMenu::_gameinfo(void) m_btnMgr.hide(m_gameinfoLblRating, true); m_btnMgr.hide(m_gameinfoLblWifiplayers, true); - for (u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblControlsReq); ++i) - if (m_gameinfoLblControlsReq[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblControlsReq); ++i) + if(m_gameinfoLblControlsReq[i] != (u16)-1) m_btnMgr.hide(m_gameinfoLblControlsReq[i], true); - for (u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblControls); ++i) - if (m_gameinfoLblControls[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblControls); ++i) + if(m_gameinfoLblControls[i] != (u16)-1) m_btnMgr.hide(m_gameinfoLblControls[i], true); // When showing synopsis, only show user labels 2 and 3 - for (u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblUser); ++i) - if (i < ARRAY_SIZE(m_gameinfoLblUser) / 2) + for(u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblUser); ++i) + if(i < ARRAY_SIZE(m_gameinfoLblUser) / 2) m_btnMgr.hide(m_gameinfoLblUser[i], true); else m_btnMgr.show(m_gameinfoLblUser[i]); @@ -172,21 +172,21 @@ void CMenu::_gameinfo(void) m_btnMgr.show(m_gameinfoLblRating); m_btnMgr.show(m_gameinfoLblWifiplayers); - for (u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblControlsReq); ++i) - if (m_gameinfoLblControlsReq[i] != -1u && i < cnt_controlsreq) + for(u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblControlsReq); ++i) + if(m_gameinfoLblControlsReq[i] != (u16)-1 && i < cnt_controlsreq) m_btnMgr.show(m_gameinfoLblControlsReq[i]); - - for (u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblControls); ++i) - if (m_gameinfoLblControls[i] != -1u && i < cnt_controls) + + for(u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblControls); ++i) + if(m_gameinfoLblControls[i] != (u16)-1 && i < cnt_controls) m_btnMgr.show(m_gameinfoLblControls[i]); - + // When showing synopsis, only show user labels 2 and 3 - for (u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblUser); ++i) - if (i < ARRAY_SIZE(m_gameinfoLblUser) / 2) + for(u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblUser); ++i) + if(i < ARRAY_SIZE(m_gameinfoLblUser) / 2) m_btnMgr.show(m_gameinfoLblUser[i]); else m_btnMgr.hide(m_gameinfoLblUser[i], true); - + m_btnMgr.hide(m_gameinfoLblSynopsis,true); } @@ -208,15 +208,15 @@ void CMenu::_hideGameInfo(bool instant) m_btnMgr.hide(m_gameinfoLblRating, instant); m_btnMgr.hide(m_gameinfoLblWifiplayers, instant); - for (u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblControlsReq); ++i) - if (m_gameinfoLblControlsReq[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblControlsReq); ++i) + if(m_gameinfoLblControlsReq[i] != (u16)-1) m_btnMgr.hide(m_gameinfoLblControlsReq[i], instant); - for (u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblUser); ++i) + for(u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblUser); ++i) m_btnMgr.hide(m_gameinfoLblUser[i], instant); - for (u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblControls); ++i) - if (m_gameinfoLblControls[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblControls); ++i) + if(m_gameinfoLblControls[i] != (u16)-1) m_btnMgr.hide(m_gameinfoLblControls[i], instant); } @@ -238,16 +238,16 @@ void CMenu::_showGameInfo(void) m_btnMgr.show(m_gameinfoLblGenre); m_btnMgr.show(m_gameinfoLblWifiplayers); - for (u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblUser); ++i) - if (i < ARRAY_SIZE(m_gameinfoLblUser) / 2) + for(u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblUser); ++i) + if(i < ARRAY_SIZE(m_gameinfoLblUser) / 2) m_btnMgr.show(m_gameinfoLblUser[i]); - for (u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblControlsReq); ++i) - if (m_gameinfoLblControlsReq[i] != -1u && i < cnt_controlsreq) + for(u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblControlsReq); ++i) + if(m_gameinfoLblControlsReq[i] != (u16)-1 && i < cnt_controlsreq) m_btnMgr.show(m_gameinfoLblControlsReq[i]); - for (u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblControls); ++i) - if (m_gameinfoLblControls[i] != -1u && i < cnt_controls) + for(u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblControls); ++i) + if(m_gameinfoLblControls[i] != (u16)-1 && i < cnt_controls) m_btnMgr.show(m_gameinfoLblControls[i]); } } @@ -274,14 +274,14 @@ void CMenu::_initGameInfoMenu(CMenu::SThemeData &theme) m_gameinfoLblTitle = _addLabel(theme, "GAMEINFO/TITLE", theme.titleFont, L"", 20, 30, 600, 75, theme.titleFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE); - for (u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblControlsReq); ++i) + for(u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblControlsReq); ++i) { string dom(sfmt("GAMEINFO/CONTROLSREQ%i", i + 1)); m_gameinfoLblControlsReq[i] = _addLabel(theme, dom.c_str(), theme.txtFont, L"", 40 + (i*60), 310, 60, 40, theme.txtFontColor, 0, emptyTex); _setHideAnim(m_gameinfoLblControlsReq[i], dom.c_str(), 0, -100, 0.f, 0.f); } - for (u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblControls); ++i) + for(u8 i = 0; i < ARRAY_SIZE(m_gameinfoLblControls); ++i) { string dom(sfmt("GAMEINFO/CONTROLS%i", i + 1)); m_gameinfoLblControls[i] = _addLabel(theme, dom.c_str(), theme.txtFont, L"", 40 + (i*60), 380, 60, 40, theme.txtFontColor, 0, emptyTex); diff --git a/source/menu/menu_main.cpp b/source/menu/menu_main.cpp index c36ea7a6..69c23ce5 100644 --- a/source/menu/menu_main.cpp +++ b/source/menu/menu_main.cpp @@ -69,8 +69,8 @@ void CMenu::_hideMain(bool instant) m_btnMgr.hide(m_mainBtnFavoritesOff, instant); m_btnMgr.hide(m_mainLblLetter, instant); m_btnMgr.hide(m_mainLblNotice, instant); - for (u32 i = 0; i < ARRAY_SIZE(m_mainLblUser); ++i) - if (m_mainLblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_mainLblUser); ++i) + if(m_mainLblUser[i] != (u16)-1) m_btnMgr.hide(m_mainLblUser[i], instant); } @@ -135,8 +135,8 @@ void CMenu::_showMain(void) break; } - for (u32 i = 1; i < ARRAY_SIZE(m_mainLblUser); ++i) - if (m_mainLblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_mainLblUser); ++i) + if(m_mainLblUser[i] != (u16)-1) m_btnMgr.show(m_mainLblUser[i]); if(m_gameList.empty()) diff --git a/source/menu/menu_nandemu.cpp b/source/menu/menu_nandemu.cpp index 14da9ff9..c6a1b9b2 100644 --- a/source/menu/menu_nandemu.cpp +++ b/source/menu/menu_nandemu.cpp @@ -10,29 +10,29 @@ #include "fileOps.h" // NandEmulation menu -u32 m_nandemuLblTitle; -u32 m_nandemuBtnBack; -u32 m_nandemuLblEmulationVal; -u32 m_nandemuLblEmulation; -u32 m_nandemuBtnEmulationM; -u32 m_nandemuBtnEmulationP; -u32 m_nandemuLblSaveDump; -u32 m_nandemuBtnAll; -u32 m_nandemuBtnMissing; -u32 m_nandemuLblNandDump; -u32 m_nandemuBtnNandDump; -u32 m_nandfileLblMessage; -u32 m_nandemuLblMessage; -u32 m_nandfileLblDialog; -u32 m_nandfinLblDialog; -u32 m_nandemuLblDialog; -u32 m_nandfilePBar; -u32 m_nandemuPBar; -u32 m_nandemuBtnExtract; -u32 m_nandemuBtnDisable; -u32 m_nandemuBtnPartition; -u32 m_nandemuLblInit; -u32 m_nandemuLblUser[4]; +u16 m_nandemuLblTitle; +u16 m_nandemuBtnBack; +u16 m_nandemuLblEmulationVal; +u16 m_nandemuLblEmulation; +u16 m_nandemuBtnEmulationM; +u16 m_nandemuBtnEmulationP; +u16 m_nandemuLblSaveDump; +u16 m_nandemuBtnAll; +u16 m_nandemuBtnMissing; +u16 m_nandemuLblNandDump; +u16 m_nandemuBtnNandDump; +u16 m_nandfileLblMessage; +u16 m_nandemuLblMessage; +u16 m_nandfileLblDialog; +u16 m_nandfinLblDialog; +u16 m_nandemuLblDialog; +u16 m_nandfilePBar; +u16 m_nandemuPBar; +u16 m_nandemuBtnExtract; +u16 m_nandemuBtnDisable; +u16 m_nandemuBtnPartition; +u16 m_nandemuLblInit; +u16 m_nandemuLblUser[4]; STexture m_nandemuBg; bool m_nandext; diff --git a/source/menu/menu_plugin.cpp b/source/menu/menu_plugin.cpp index fc255573..a67c3013 100644 --- a/source/menu/menu_plugin.cpp +++ b/source/menu/menu_plugin.cpp @@ -7,16 +7,16 @@ u32 Plugin_curPage; 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]; +u16 m_pluginLblPage; +u16 m_pluginBtnPageM; +u16 m_pluginBtnPageP; +u16 m_pluginBtnBack; +u16 m_pluginLblTitle; +u16 m_pluginLblCat[21]; +u16 m_pluginBtn[21]; +u16 m_pluginBtnCat[21]; +u16 m_pluginBtnCats[21]; +u16 m_pluginLblUser[4]; u8 m_max_plugins; STexture m_pluginBg; @@ -27,9 +27,9 @@ void CMenu::_hidePluginSettings(bool instant) m_btnMgr.hide(m_pluginLblPage, instant); m_btnMgr.hide(m_pluginBtnPageM, instant); m_btnMgr.hide(m_pluginBtnPageP, instant); - for(u32 i = 0; i < ARRAY_SIZE(m_pluginLblUser); ++i) + for(u8 i = 0; i < ARRAY_SIZE(m_pluginLblUser); ++i) { - if(m_pluginLblUser[i] != -1u) + if(m_pluginLblUser[i] != (u16)-1) m_btnMgr.hide(m_pluginLblUser[i], instant); } @@ -43,9 +43,9 @@ void CMenu::_hidePluginSettings(bool instant) void CMenu::_showPluginSettings(void) { _setBg(m_pluginBg, m_pluginBg); - for(u32 i = 0; i < ARRAY_SIZE(m_pluginLblUser); ++i) + for(u8 i = 0; i < ARRAY_SIZE(m_pluginLblUser); ++i) { - if(m_pluginLblUser[i] != -1u) + if(m_pluginLblUser[i] != (u16)-1) m_btnMgr.show(m_pluginLblUser[i]); } m_btnMgr.show(m_pluginLblTitle); @@ -205,7 +205,7 @@ void CMenu::_initPluginSettingsMenu(CMenu::SThemeData &theme) _setHideAnim(m_pluginBtnPageM, "PLUGIN/PAGE_MINUS", 0, 200, 1.f, 0.f); _setHideAnim(m_pluginBtnPageP, "PLUGIN/PAGE_PLUS", 0, 200, 1.f, 0.f); _setHideAnim(m_pluginBtnBack, "PLUGIN/BACK_BTN", 0, 200, 1.f, 0.f); - for(int i = 0; i < 21; ++i) + for(u8 i = 0; i < 21; ++i) { _setHideAnim(m_pluginBtnCat[i], fmt("PLUGIN/PLUGIN_%i_BTN", i), 0, 0, 1.f, 0.f); _setHideAnim(m_pluginBtnCats[i], fmt("PLUGIN/PLUGIN_%i_BTNS", i), 0, 0, 1.f, 0.f); diff --git a/source/menu/menu_startup.cpp b/source/menu/menu_startup.cpp index 4ebaaf4a..a9338b1f 100644 --- a/source/menu/menu_startup.cpp +++ b/source/menu/menu_startup.cpp @@ -22,20 +22,20 @@ string m_sourceDir; Config m_source; // Source menu -u32 m_sourceLblNotice; -u32 m_sourceLblPage; -u32 m_sourceBtnPageM; -u32 m_sourceBtnPageP; -u32 m_sourceBtnBack; -u32 m_sourceLblTitle; -u32 m_sourceBtnSource[36]; -u32 m_sourceLblUser[4]; +u16 m_sourceLblNotice; +u16 m_sourceLblPage; +u16 m_sourceBtnPageM; +u16 m_sourceBtnPageP; +u16 m_sourceBtnBack; +u16 m_sourceLblTitle; +u16 m_sourceBtnSource[36]; +u16 m_sourceLblUser[4]; STexture m_sourceBg; -u32 m_sourceBtnDML; -u32 m_sourceBtnEmu; -u32 m_sourceBtnUsb; -u32 m_sourceBtnChannel; -u32 m_sourceBtnHomebrew; +u16 m_sourceBtnDML; +u16 m_sourceBtnEmu; +u16 m_sourceBtnUsb; +u16 m_sourceBtnChannel; +u16 m_sourceBtnHomebrew; void CMenu::_hideSource(bool instant) { @@ -51,32 +51,32 @@ void CMenu::_hideSource(bool instant) m_btnMgr.hide(m_sourceBtnDML, instant); m_btnMgr.hide(m_sourceBtnEmu, instant); - for (u32 i = 0; i < ARRAY_SIZE(m_sourceLblUser); ++i) + u8 i = 0; + for(i = 0; i < ARRAY_SIZE(m_sourceLblUser); ++i) { - if (m_sourceLblUser[i] != -1u) + if(m_sourceLblUser[i] != (u16)-1) m_btnMgr.hide(m_sourceLblUser[i], instant); } - for (int i = 0; i < 36; ++i) - { + for(i = 0; i < 36; ++i) m_btnMgr.hide(m_sourceBtnSource[i]); - } } void CMenu::_showSource(void) { _setBg(m_sourceBg, m_sourceBg); - - for (u32 i = 0; i < ARRAY_SIZE(m_sourceLblUser); ++i) + + u8 i = 0; + for(i = 0; i < ARRAY_SIZE(m_sourceLblUser); ++i) { - if (m_sourceLblUser[i] != -1u) + if(m_sourceLblUser[i] != (u16)-1) m_btnMgr.show(m_sourceLblUser[i]); } m_btnMgr.show(m_sourceLblTitle); m_btnMgr.show(m_sourceBtnBack); - for (int i = 12; i < 36; ++i) + for(i = 12; i < 36; ++i) { string source = m_source.getString(fmt("BUTTON_%i", i), "source", ""); if (!source.empty()) @@ -96,12 +96,12 @@ void CMenu::_updateSourceBtns(void) m_btnMgr.show(m_sourceBtnPageM); m_btnMgr.show(m_sourceBtnPageP); } - for (int i = 0; i < 36; ++i) + for (u8 i = 0; i < 36; ++i) m_btnMgr.hide(m_sourceBtnSource[i]); - int j = (Source_curPage - 1) * 12; + u8 j = (Source_curPage - 1) * 12; - for (int i = j; i < (j + 12); ++i) + for (u8 i = j; i < (j + 12); ++i) { string source = m_source.getString(fmt("BUTTON_%i", i), "source", ""); if (!source.empty()) diff --git a/source/menu/menu_system.cpp b/source/menu/menu_system.cpp index 38ceadf7..51e5cac1 100644 --- a/source/menu/menu_system.cpp +++ b/source/menu/menu_system.cpp @@ -227,8 +227,8 @@ void CMenu::_hideSystem(bool instant) m_btnMgr.hide(m_systemLblVerSelectVal); m_btnMgr.hide(m_systemBtnVerSelectM); m_btnMgr.hide(m_systemBtnVerSelectP); - for (u32 i = 0; i < ARRAY_SIZE(m_systemLblUser); ++i) - if (m_systemLblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_systemLblUser); ++i) + if(m_systemLblUser[i] != (u16)-1) m_btnMgr.hide(m_systemLblUser[i], instant); } @@ -244,8 +244,8 @@ void CMenu::_showSystem(void) m_btnMgr.show(m_systemBtnVerSelectM); m_btnMgr.show(m_systemBtnVerSelectP); m_btnMgr.show(m_systemBtnDownload); - for (u32 i = 0; i < ARRAY_SIZE(m_systemLblUser); ++i) - if (m_systemLblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_systemLblUser); ++i) + if(m_systemLblUser[i] != (u16)-1) m_btnMgr.show(m_systemLblUser[i]); _textSystem(); } diff --git a/source/menu/menu_wbfs.cpp b/source/menu/menu_wbfs.cpp index a7796eb7..7ee8daac 100644 --- a/source/menu/menu_wbfs.cpp +++ b/source/menu/menu_wbfs.cpp @@ -18,8 +18,8 @@ void CMenu::_hideWBFS(bool instant) m_btnMgr.hide(m_wbfsBtnGo, instant); m_btnMgr.hide(m_wbfsLblDialog); m_btnMgr.hide(m_wbfsLblMessage); - for (u32 i = 0; i < ARRAY_SIZE(m_wbfsLblUser); ++i) - if (m_wbfsLblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_wbfsLblUser); ++i) + if(m_wbfsLblUser[i] != (u16)-1) m_btnMgr.hide(m_wbfsLblUser[i], instant); } @@ -45,8 +45,8 @@ void CMenu::_showWBFS(CMenu::WBFS_OP op) m_btnMgr.show(m_wbfsBtnBack); m_btnMgr.show(m_wbfsBtnGo); m_btnMgr.show(m_wbfsLblDialog); - for (u32 i = 0; i < ARRAY_SIZE(m_wbfsLblUser); ++i) - if (m_wbfsLblUser[i] != -1u) + for(u8 i = 0; i < ARRAY_SIZE(m_wbfsLblUser); ++i) + if(m_wbfsLblUser[i] != (u16)-1) m_btnMgr.show(m_wbfsLblUser[i]); }