mirror of
https://github.com/Fledge68/WiiFlow_Lite.git
synced 2024-11-30 15:14:18 +01:00
-small fixes for using d-pad to switch views. Game covers no longer move when changing view and view only loads if its enabled and different than current view.
This commit is contained in:
parent
5e3df23f76
commit
5b203f8252
@ -178,6 +178,7 @@ int CMenu::main(void)
|
|||||||
bool dpad_mode = m_cfg.getBool("GENERAL", "dpad_mode", false);
|
bool dpad_mode = m_cfg.getBool("GENERAL", "dpad_mode", false);
|
||||||
parental_homebrew = m_cfg.getBool("HOMEBREW", "parental", false);
|
parental_homebrew = m_cfg.getBool("HOMEBREW", "parental", false);
|
||||||
|
|
||||||
|
u32 cv=m_current_view;
|
||||||
m_reload = false;
|
m_reload = false;
|
||||||
static u32 disc_check = 0;
|
static u32 disc_check = 0;
|
||||||
int done = 0;
|
int done = 0;
|
||||||
@ -260,6 +261,7 @@ int CMenu::main(void)
|
|||||||
m_btnMgr.noClick(true);
|
m_btnMgr.noClick(true);
|
||||||
if ((m_btnMgr.selected(m_mainBtnChannel) || m_btnMgr.selected(m_mainBtnUsb) || m_btnMgr.selected(m_mainBtnDML) || m_btnMgr.selected(m_mainBtnHomebrew)) && dpad_mode && (BTN_UP_PRESSED || BTN_DOWN_PRESSED || BTN_LEFT_PRESSED || BTN_RIGHT_PRESSED))
|
if ((m_btnMgr.selected(m_mainBtnChannel) || m_btnMgr.selected(m_mainBtnUsb) || m_btnMgr.selected(m_mainBtnDML) || m_btnMgr.selected(m_mainBtnHomebrew)) && dpad_mode && (BTN_UP_PRESSED || BTN_DOWN_PRESSED || BTN_LEFT_PRESSED || BTN_RIGHT_PRESSED))
|
||||||
{
|
{
|
||||||
|
cv = m_current_view;
|
||||||
if (BTN_UP_PRESSED)
|
if (BTN_UP_PRESSED)
|
||||||
m_current_view = COVERFLOW_USB;
|
m_current_view = COVERFLOW_USB;
|
||||||
else if (BTN_DOWN_PRESSED && m_show_dml)
|
else if (BTN_DOWN_PRESSED && m_show_dml)
|
||||||
@ -268,9 +270,14 @@ int CMenu::main(void)
|
|||||||
m_current_view = COVERFLOW_HOMEBREW;
|
m_current_view = COVERFLOW_HOMEBREW;
|
||||||
else if (BTN_RIGHT_PRESSED && show_channel)
|
else if (BTN_RIGHT_PRESSED && show_channel)
|
||||||
m_current_view = COVERFLOW_CHANNEL;
|
m_current_view = COVERFLOW_CHANNEL;
|
||||||
|
if (cv != m_current_view)
|
||||||
|
{
|
||||||
m_category = m_cat.getInt(_domainFromView(), "category", 0);
|
m_category = m_cat.getInt(_domainFromView(), "category", 0);
|
||||||
LoadView();
|
LoadView();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
if (cv == m_current_view && !m_btnMgr.selected(m_mainBtnChannel) && !m_btnMgr.selected(m_mainBtnUsb) && !m_btnMgr.selected(m_mainBtnDML) && !m_btnMgr.selected(m_mainBtnHomebrew))
|
||||||
|
{
|
||||||
if (!m_btnMgr.selected(m_mainBtnQuit) && !BTN_B_HELD && (BTN_UP_REPEAT || RIGHT_STICK_UP))
|
if (!m_btnMgr.selected(m_mainBtnQuit) && !BTN_B_HELD && (BTN_UP_REPEAT || RIGHT_STICK_UP))
|
||||||
m_cf.up();
|
m_cf.up();
|
||||||
if (!m_btnMgr.selected(m_mainBtnQuit) && ((!BTN_B_HELD && (BTN_RIGHT_REPEAT || RIGHT_STICK_RIGHT)) || WROLL_RIGHT))
|
if (!m_btnMgr.selected(m_mainBtnQuit) && ((!BTN_B_HELD && (BTN_RIGHT_REPEAT || RIGHT_STICK_RIGHT)) || WROLL_RIGHT))
|
||||||
@ -279,6 +286,7 @@ int CMenu::main(void)
|
|||||||
m_cf.down();
|
m_cf.down();
|
||||||
if (!m_btnMgr.selected(m_mainBtnQuit) && ((!BTN_B_HELD && (BTN_LEFT_REPEAT || RIGHT_STICK_LEFT)) || WROLL_LEFT))
|
if (!m_btnMgr.selected(m_mainBtnQuit) && ((!BTN_B_HELD && (BTN_LEFT_REPEAT || RIGHT_STICK_LEFT)) || WROLL_LEFT))
|
||||||
m_cf.left();
|
m_cf.left();
|
||||||
|
}
|
||||||
m_btnMgr.noClick(false);
|
m_btnMgr.noClick(false);
|
||||||
//CF Layout select
|
//CF Layout select
|
||||||
if (!BTN_B_HELD && (BTN_1_PRESSED || BTN_2_PRESSED))
|
if (!BTN_B_HELD && (BTN_1_PRESSED || BTN_2_PRESSED))
|
||||||
|
Loading…
Reference in New Issue
Block a user