From e7ac70512d774b8129c404a5026832a7238cbcf3 Mon Sep 17 00:00:00 2001 From: fledge68 Date: Sat, 2 Apr 2016 16:38:11 +0000 Subject: [PATCH] - removed dpad_mode, b_lr_mode, and use_grab. --- source/menu/menu.hpp | 1 - source/menu/menu_input.cpp | 50 ----------------------------- source/menu/menu_main.cpp | 65 +++----------------------------------- 3 files changed, 4 insertions(+), 112 deletions(-) diff --git a/source/menu/menu.hpp b/source/menu/menu.hpp index 4c0fab9a..ca8c7c6c 100644 --- a/source/menu/menu.hpp +++ b/source/menu/menu.hpp @@ -1156,7 +1156,6 @@ private: bool _isNetworkAvailable(); int _initNetwork(); void LoadView(void); - void _getGrabStatus(void); static void _addDiscProgress(int status, int total, void *user_data); static void _ShowProgress(int dumpstat, int dumpprog, int filestat, int fileprog, int files, int folders, const char *tmess, void *user_data); static int _gameInstaller(void *obj); diff --git a/source/menu/menu_input.cpp b/source/menu/menu_input.cpp index 42c10662..06c4eba5 100644 --- a/source/menu/menu_input.cpp +++ b/source/menu/menu_input.cpp @@ -609,56 +609,6 @@ bool CMenu::wRoll_Right(void) return false; } -void CMenu::_getGrabStatus(void) -{ - static bool wGrabStatus[WPAD_MAX_WIIMOTES] = {0}; - static float wX[WPAD_MAX_WIIMOTES] = {0}; - static float wY[WPAD_MAX_WIIMOTES] = {0}; - - static bool gGrabStatus[WPAD_MAX_WIIMOTES] = {0}; - static float gX[WPAD_MAX_WIIMOTES] = {0}; - static float gY[WPAD_MAX_WIIMOTES] = {0}; - - for(int chan = WPAD_MAX_WIIMOTES-1; chan >= 0; chan--) - { - wGrabStatus[chan] = (wBtn_HeldChan(WPAD_BUTTON_B, WPAD_EXP_NONE, chan) - || wBtn_HeldChan(WPAD_CLASSIC_BUTTON_B, WPAD_EXP_CLASSIC, chan)); - gGrabStatus[chan] = GBTN_B & PAD_ButtonsHeld(chan); - if((wGrabStatus[chan] && wX[chan] > 0 && wd[chan]->ir.x < wX[chan] - 30) - || (gGrabStatus[chan] && gX[chan] > 0 && stickPointer_x[chan] < gX[chan])) - CoverFlow.left(); - if((wGrabStatus[chan] && wX[chan] > 0 && wd[chan]->ir.x > wX[chan] + 30) - || (gGrabStatus[chan] && gX[chan] > 0 && stickPointer_x[chan] > gX[chan])) - CoverFlow.right(); - if((wGrabStatus[chan] && wY[chan] > 0 && wd[chan]->ir.y < wY[chan] - 30) - || (gGrabStatus[chan] && gY[chan] > 0 && stickPointer_y[chan] < gY[chan])) - CoverFlow.up(); - if((wGrabStatus[chan] && wY[chan] > 0 && wd[chan]->ir.y > wY[chan] + 30) - || (gGrabStatus[chan] && gY[chan] > 0 && stickPointer_y[chan] > gY[chan])) - CoverFlow.down(); - if(wGrabStatus[chan]) - { - wX[chan] = wd[chan]->ir.x; - wY[chan] = wd[chan]->ir.y; - } - else - { - wX[chan] = 0; - wY[chan] = 0; - } - if(gGrabStatus[chan]) - { - gX[chan] = stickPointer_x[chan]; - gY[chan] = stickPointer_y[chan]; - } - else - { - gX[chan] = 0; - gY[chan] = 0; - } - } -} - void CMenu::ShowZone(SZone zone, bool &showZone) { if(zone.hide) diff --git a/source/menu/menu_main.cpp b/source/menu/menu_main.cpp index f190834d..73ae5589 100644 --- a/source/menu/menu_main.cpp +++ b/source/menu/menu_main.cpp @@ -245,9 +245,6 @@ int CMenu::main(void) show_homebrew = !m_cfg.getBool(HOMEBREW_DOMAIN, "disable", false); show_channel = !m_cfg.getBool("GENERAL", "hidechannel", false); show_emu = !m_cfg.getBool(PLUGIN_DOMAIN, "disable", false); - bool dpad_mode = m_cfg.getBool("GENERAL", "dpad_mode", false); - bool b_lr_mode = m_cfg.getBool("GENERAL", "b_lr_mode", false); - bool use_grab = m_cfg.getBool("GENERAL", "use_grab", false); m_use_source = m_cfg.getBool("GENERAL", "use_source", true); bool bheld = false; bool bUsed = false; @@ -350,42 +347,6 @@ int CMenu::main(void) } } } - if(dpad_mode && (BTN_UP_PRESSED || BTN_DOWN_PRESSED || BTN_LEFT_PRESSED || BTN_RIGHT_PRESSED) && (m_btnMgr.selected(m_mainBtnChannel) || m_btnMgr.selected(m_mainBtnUsb) || m_btnMgr.selected(m_mainBtnDML) || m_btnMgr.selected(m_mainBtnHomebrew) || m_btnMgr.selected(m_mainBtnEmu))) - { - u8 lastView = m_current_view; - if(BTN_UP_PRESSED) - m_current_view = COVERFLOW_WII; - else if(BTN_DOWN_PRESSED && (m_show_dml || m_devo_installed || m_nintendont_installed)) - m_current_view = COVERFLOW_GAMECUBE; - else if(BTN_LEFT_PRESSED && show_emu) - m_current_view = COVERFLOW_PLUGIN; - else if(BTN_RIGHT_PRESSED && show_channel) - m_current_view = COVERFLOW_CHANNEL; - if(lastView == m_current_view && show_homebrew && (parental_homebrew || !m_locked)) - m_current_view = COVERFLOW_HOMEBREW; - _clearSources(); - switch(m_current_view) - { - case COVERFLOW_WII: - m_cfg.setBool(WII_DOMAIN, "source", true); - break; - case COVERFLOW_GAMECUBE: - m_cfg.setBool(GC_DOMAIN, "source", true); - break; - case COVERFLOW_CHANNEL: - m_cfg.setBool(CHANNEL_DOMAIN, "source", true); - break; - case COVERFLOW_HOMEBREW: - m_cfg.setBool(HOMEBREW_DOMAIN, "source", true); - break; - default: - m_cfg.setBool(PLUGIN_DOMAIN, "source", true); - } - m_catStartPage = 1; - m_combined_view = false; - LoadView(); - continue; - } if(BTN_HOME_PRESSED && !m_sourceflow) { _hideMain(); @@ -660,19 +621,9 @@ int CMenu::main(void) } } else if(BTN_MINUS_PRESSED) - { - if(b_lr_mode) - MusicPlayer.Previous(); - else - CoverFlow.pageUp(); - } + CoverFlow.pageUp(); else if(BTN_PLUS_PRESSED) - { - if(b_lr_mode) - MusicPlayer.Next(); - else - CoverFlow.pageDown(); - } + CoverFlow.pageDown(); } else { @@ -711,18 +662,12 @@ int CMenu::main(void) else if(BTN_LEFT_PRESSED) { bUsed = true; - if(b_lr_mode) - CoverFlow.pageUp(); - else - MusicPlayer.Previous(); + MusicPlayer.Previous(); } else if(BTN_RIGHT_PRESSED) { bUsed = true; - if(b_lr_mode) - CoverFlow.pageDown(); - else - MusicPlayer.Next(); + MusicPlayer.Next(); } else if(BTN_PLUS_PRESSED && !m_locked && !m_sourceflow) { @@ -783,8 +728,6 @@ int CMenu::main(void) _showMain(); _initCF(); } - if(use_grab) - _getGrabStatus(); if(m_showtimer > 0) { if(--m_showtimer == 0)