diff --git a/out/bins/ext_booter.bin b/out/bins/ext_booter.bin index 6b082c2d..d91d28a2 100644 Binary files a/out/bins/ext_booter.bin and b/out/bins/ext_booter.bin differ diff --git a/out/boot.dol b/out/boot.dol index 9570709f..9cdcf664 100644 Binary files a/out/boot.dol and b/out/boot.dol differ diff --git a/out/imgs/dvdskin_clear.png b/out/imgs/dvdskin_clear.png new file mode 100644 index 00000000..06fd604f Binary files /dev/null and b/out/imgs/dvdskin_clear.png differ diff --git a/source/defines.h b/source/defines.h index 80efd89a..93aecdb1 100644 --- a/source/defines.h +++ b/source/defines.h @@ -1,6 +1,6 @@ #define APP_NAME "WiiFlow WFL" -#define APP_VERSION "5.4.9 beta 1" +#define APP_VERSION "5.4.9 beta 2" #define APP_DATA_DIR "wiiflow" #define APPS_DIR "apps/wiiflow" diff --git a/source/gui/coverflow.cpp b/source/gui/coverflow.cpp index 5fe14329..34d7ef10 100644 --- a/source/gui/coverflow.cpp +++ b/source/gui/coverflow.cpp @@ -679,6 +679,7 @@ void CCoverFlow::shutdown(void) TexHandle.Cleanup(m_dvdSkin_Yellow); TexHandle.Cleanup(m_dvdSkin_GreenOne); TexHandle.Cleanup(m_dvdSkin_GreenTwo); + TexHandle.Cleanup(m_dvdSkin_Clear); clear(); if(m_flipSound != NULL) @@ -1432,6 +1433,9 @@ void CCoverFlow::_drawCoverBox(int i, bool mirror, CCoverFlow::DrawMode dm) case 0x00E360: GX_InitTexObj(&texObj, m_dvdSkin_GreenTwo.data, m_dvdSkin_GreenTwo.width, m_dvdSkin_GreenTwo.height, m_dvdSkin_GreenTwo.format, GX_CLAMP, GX_CLAMP, GX_FALSE); break; + case 0x111111: + GX_InitTexObj(&texObj, m_dvdSkin_Clear.data, m_dvdSkin_Clear.width, m_dvdSkin_Clear.height, m_dvdSkin_Clear.format, GX_CLAMP, GX_CLAMP, GX_FALSE); + break; default: GX_InitTexObj(&texObj, m_dvdSkin.data, m_dvdSkin.width, m_dvdSkin.height, m_dvdSkin.format, GX_CLAMP, GX_CLAMP, GX_FALSE); break; @@ -1949,6 +1953,8 @@ bool CCoverFlow::start(const string &m_imgsDir) return false; if(TexHandle.fromImageFile(m_dvdSkin_GreenTwo, fmt("%s/dvdskin_greentwo.png", m_imgsDir.c_str())) != TE_OK) return false; + if(TexHandle.fromImageFile(m_dvdSkin_Clear, fmt("%s/dvdskin_clear.png", m_imgsDir.c_str())) != TE_OK) + return false; m_dvdskin_loaded = true; } /* load the no pic or loading cover images if not already done */ diff --git a/source/gui/coverflow.hpp b/source/gui/coverflow.hpp index a01273bb..ec1cb5dd 100644 --- a/source/gui/coverflow.hpp +++ b/source/gui/coverflow.hpp @@ -262,6 +262,7 @@ private: TexData m_dvdSkin_Yellow; TexData m_dvdSkin_GreenOne; TexData m_dvdSkin_GreenTwo; + TexData m_dvdSkin_Clear; // Settings string m_pngLoadCover; string m_pngLoadCoverFlat; diff --git a/source/menu/menu_sm_editor.cpp b/source/menu/menu_sm_editor.cpp index 9fee34c0..54d8caf3 100644 --- a/source/menu/menu_sm_editor.cpp +++ b/source/menu/menu_sm_editor.cpp @@ -158,7 +158,7 @@ void CMenu::_checkboxesMenu(u8 md) } CB_curPage = 1; - CB_numPages = (max_checkbox / 10) + 1; + CB_numPages = ((max_checkbox - 1) / 10) + 1; SetupInput(); _showCheckboxesMenu(); @@ -171,9 +171,9 @@ void CMenu::_checkboxesMenu(u8 md) if(mode == 4) { mode = 2; - max_checkbox = m_max_source_btn; + max_checkbox = m_max_source_btn + 1; CB_curPage = (curSource + 1) / 10 + 1; - CB_numPages = (max_checkbox / 10) + 1; + CB_numPages = ((max_checkbox - 1) / 10) + 1; m_btnMgr.hide(m_checkboxesLblTitle, true); for(int i = 0; i < 11; ++i) { @@ -244,7 +244,7 @@ void CMenu::_checkboxesMenu(u8 md) max_checkbox = 0; while(m_plugin.PluginExist(max_checkbox)) max_checkbox++; CB_curPage = 1; - CB_numPages = (max_checkbox / 10) + 1; + CB_numPages = ((max_checkbox - 1)/ 10) + 1; m_btnMgr.hide(m_checkboxesLblTitle, true); for(int i = 0; i < 11; ++i) {