r246
in menu\menu.cpp change the code at line 72 to:
Code:
m_bnrSndVol = 0;
m_gameSettingsPage = GAME_SETTING_PAGE_NONE;
m_gameSettingsPageLast = GAME_SETTING_PAGE_NONE;
m_directLaunch = false;
in menu/menu.hpp at line 359, change the code to:
Code:
u32 m_gameSettingsPage;
u32 m_gameSettingsPageLast;
enum GameSettingsPages
{
GAME_SETTING_PAGE_NONE,
GAME_SETTING_PAGE_1,
GAME_SETTING_PAGE_2,
GAME_SETTING_PAGE_3,
GAME_SETTING_CATEGORY_PAGE_1,
GAME_SETTING_CATEGORY_PAGE_2,
GAME_SETTING_CATEGORY_PAGE_3
};
enum GameSettingsPageOffsets {GAME_SETTING_CATEGORY_PAGE_OFFSET = GAME_SETTING_CATEGORY_PAGE_1 - 1};
// System Menu
in menu/menu_config_game.cpp
change line 13 to:
Code:
const u32 g_numGCfPages = 3;
at 450, add an else so the code is now:
Code:
}
else
for (int i = 0; i < 12; ++i)
if (m_btnMgr.selected(m_gameSettingsBtnCategory[i]))
{
m_gameSettingCategories[i] = m_gameSettingCategories[i] == '1' ? '0' : '1';
char categories[13];
memset(&categories, 0, sizeof(categories));
memcpy(&categories, &m_gameSettingCategories, sizeof(m_gameSettingCategories));
m_cat.setString("CATEGORIES", id, categories);
_showGameSettings();
break;
}
at 447 change from:
to:
Code:
m_gameSettingsPageLast = m_gameSettingsPage;
m_gameSettingsPage = GAME_SETTING_CATEGORY_PAGE_1;
at 317, change from:
Code:
if ((BTN_MINUS_PRESSED || BTN_LEFT_PRESSED || (BTN_A_PRESSED && m_btnMgr.selected(m_gameSettingsBtnPageM))) && !m_locked)
{
if (m_gameSettingsPage == 1)
m_gameSettingsPage = g_numGCfPages;
else if (m_gameSettingsPage == 51)
m_gameSettingsPage = 53;
else if ((m_gameSettingsPage > 1 && m_gameSettingsPage <= g_numGCfPages) || m_gameSettingsPage > 51)
--m_gameSettingsPage;
if(BTN_LEFT_PRESSED || BTN_MINUS_PRESSED) m_btnMgr.click(m_gameSettingsBtnPageM);
_showGameSettings();
}
else if ((BTN_PLUS_PRESSED || BTN_RIGHT_PRESSED || (BTN_A_PRESSED && m_btnMgr.selected(m_gameSettingsBtnPageP))) && !m_locked)
{
if (m_gameSettingsPage == g_numGCfPages)
m_gameSettingsPage = 1;
else if (m_gameSettingsPage == 53)
m_gameSettingsPage = 51;
else if (m_gameSettingsPage < g_numGCfPages || (m_gameSettingsPage > g_numGCfPages && m_gameSettingsPage < 53 && m_max_categories > 8)
|| (m_gameSettingsPage > g_numGCfPages && m_gameSettingsPage < 52 && m_max_categories > 3))
to:
Code:
if (BTN_MINUS_PRESSED || BTN_LEFT_PRESSED || (BTN_A_PRESSED && m_btnMgr.selected(m_gameSettingsBtnPageM)))
{
m_gameSettingsPageLast = m_gameSettingsPage;
if (m_gameSettingsPage == GAME_SETTING_PAGE_1)
m_gameSettingsPage = g_numGCfPages;
else if (m_gameSettingsPage == GAME_SETTING_CATEGORY_PAGE_1)
m_gameSettingsPage = GAME_SETTING_CATEGORY_PAGE_3;
else if ((m_gameSettingsPage > GAME_SETTING_PAGE_1 && m_gameSettingsPage <= g_numGCfPages) || m_gameSettingsPage > GAME_SETTING_CATEGORY_PAGE_1)
--m_gameSettingsPage;
if(BTN_LEFT_PRESSED || BTN_MINUS_PRESSED) m_btnMgr.click(m_gameSettingsBtnPageM);
_showGameSettings();
}
else if (BTN_PLUS_PRESSED || BTN_RIGHT_PRESSED || (BTN_A_PRESSED && m_btnMgr.selected(m_gameSettingsBtnPageP)))
{
m_gameSettingsPageLast = m_gameSettingsPage;
if (m_gameSettingsPage == g_numGCfPages)
m_gameSettingsPage = GAME_SETTING_PAGE_1;
else if (m_gameSettingsPage == GAME_SETTING_CATEGORY_PAGE_3)
m_gameSettingsPage = GAME_SETTING_CATEGORY_PAGE_1;
else if (m_gameSettingsPage < g_numGCfPages || (m_gameSettingsPage > g_numGCfPages && m_gameSettingsPage < GAME_SETTING_CATEGORY_PAGE_3 && m_max_categories > 8)
|| (m_gameSettingsPage > g_numGCfPages && m_gameSettingsPage < GAME_SETTING_CATEGORY_PAGE_2 && m_max_categories > 3))
at 306, from:
to:
Code:
m_gameSettingsPageLast = m_gameSettingsPage;
m_gameSettingsPage = GAME_SETTING_PAGE_1;
at 269, from:
to:
Code:
page -= GAME_SETTING_CATEGORY_PAGE_OFFSET;
change the code at 94 from:
Code:
if (m_gameSettingsPage == 1)
{
m_btnMgr.show(m_gameSettingsLblCover);
m_btnMgr.show(m_gameSettingsBtnCover);
m_btnMgr.show(m_gameSettingsBtnCategoryMain);
m_btnMgr.show(m_gameSettingsLblCategoryMain);
m_btnMgr.show(m_gameSettingsLblGameLanguage);
m_btnMgr.show(m_gameSettingsLblLanguage);
m_btnMgr.show(m_gameSettingsBtnLanguageP);
m_btnMgr.show(m_gameSettingsBtnLanguageM);
m_btnMgr.show(m_gameSettingsLblGameVideo);
m_btnMgr.show(m_gameSettingsLblVideo);
m_btnMgr.show(m_gameSettingsBtnVideoP);
m_btnMgr.show(m_gameSettingsBtnVideoM);
}
else
{
m_btnMgr.hide(m_gameSettingsLblCover);
m_btnMgr.hide(m_gameSettingsBtnCover);
m_btnMgr.hide(m_gameSettingsBtnCategoryMain);
m_btnMgr.hide(m_gameSettingsLblCategoryMain);
m_btnMgr.hide(m_gameSettingsLblGameLanguage);
m_btnMgr.hide(m_gameSettingsLblLanguage);
m_btnMgr.hide(m_gameSettingsBtnLanguageP);
m_btnMgr.hide(m_gameSettingsBtnLanguageM);
m_btnMgr.hide(m_gameSettingsLblGameVideo);
m_btnMgr.hide(m_gameSettingsLblVideo);
m_btnMgr.hide(m_gameSettingsBtnVideoP);
m_btnMgr.hide(m_gameSettingsBtnVideoM);
}
if (m_gameSettingsPage == 2)
{
m_btnMgr.show(m_gameSettingsLblDebugger);
m_btnMgr.show(m_gameSettingsLblDebuggerV);
m_btnMgr.show(m_gameSettingsBtnDebuggerP);
m_btnMgr.show(m_gameSettingsBtnDebuggerM);
m_btnMgr.show(m_gameSettingsLblHooktype);
m_btnMgr.show(m_gameSettingsLblHooktypeVal);
m_btnMgr.show(m_gameSettingsBtnHooktypeM);
m_btnMgr.show(m_gameSettingsBtnHooktypeP);
m_btnMgr.show(m_gameSettingsLblOcarina);
m_btnMgr.show(m_gameSettingsBtnOcarina);
m_btnMgr.show(m_gameSettingsLblCheat);
m_btnMgr.show(m_gameSettingsBtnCheat);
}
else
{
m_btnMgr.hide(m_gameSettingsLblDebugger);
m_btnMgr.hide(m_gameSettingsLblDebuggerV);
m_btnMgr.hide(m_gameSettingsBtnDebuggerP);
m_btnMgr.hide(m_gameSettingsBtnDebuggerM);
m_btnMgr.hide(m_gameSettingsLblHooktype);
m_btnMgr.hide(m_gameSettingsLblHooktypeVal);
m_btnMgr.hide(m_gameSettingsBtnHooktypeM);
m_btnMgr.hide(m_gameSettingsBtnHooktypeP);
m_btnMgr.hide(m_gameSettingsLblOcarina);
m_btnMgr.hide(m_gameSettingsBtnOcarina);
m_btnMgr.hide(m_gameSettingsLblCheat);
m_btnMgr.hide(m_gameSettingsBtnCheat);
}
if (m_gameSettingsPage == 3)
{
m_btnMgr.show(m_gameSettingsLblPatchVidModes);
m_btnMgr.show(m_gameSettingsLblPatchVidModesVal);
m_btnMgr.show(m_gameSettingsBtnPatchVidModesM);
m_btnMgr.show(m_gameSettingsBtnPatchVidModesP);
m_btnMgr.show(m_gameSettingsLblVipatch);
m_btnMgr.show(m_gameSettingsBtnVipatch);
m_btnMgr.show(m_gameSettingsLblCountryPatch);
m_btnMgr.show(m_gameSettingsBtnCountryPatch);
if(m_current_view == COVERFLOW_USB)
{
m_btnMgr.show(m_gameSettingsLblEmulationVal);
m_btnMgr.show(m_gameSettingsLblEmulation);
m_btnMgr.show(m_gameSettingsBtnEmulationP);
m_btnMgr.show(m_gameSettingsBtnEmulationM);
}
}
else
{
m_btnMgr.hide(m_gameSettingsLblPatchVidModes);
m_btnMgr.hide(m_gameSettingsLblPatchVidModesVal);
m_btnMgr.hide(m_gameSettingsBtnPatchVidModesM);
m_btnMgr.hide(m_gameSettingsBtnPatchVidModesP);
m_btnMgr.hide(m_gameSettingsLblVipatch);
m_btnMgr.hide(m_gameSettingsBtnVipatch);
m_btnMgr.hide(m_gameSettingsLblCountryPatch);
m_btnMgr.hide(m_gameSettingsBtnCountryPatch);
m_btnMgr.hide(m_gameSettingsLblEmulationVal);
m_btnMgr.hide(m_gameSettingsLblEmulation);
m_btnMgr.hide(m_gameSettingsBtnEmulationP);
m_btnMgr.hide(m_gameSettingsBtnEmulationM);
}
u32 i = 0;
//Categories Pages
if (m_gameSettingsPage == 51)
{
for (i = 1; i < (u32)min(m_max_categories + 1, 5); ++i)
{
m_btnMgr.show(m_gameSettingsBtnCategory[i]);
m_btnMgr.show(m_gameSettingsLblCategory[i]);
}
}
else
{
for (i = 1; i < (u32)min(m_max_categories + 1, 5); ++i)
{
m_btnMgr.hide(m_gameSettingsBtnCategory[i]);
m_btnMgr.hide(m_gameSettingsLblCategory[i]);
}
}
if (m_gameSettingsPage == 52)
{
for (i = 5; i < (u32)min(m_max_categories + 1, 9); ++i)
{
m_btnMgr.show(m_gameSettingsBtnCategory[i]);
m_btnMgr.show(m_gameSettingsLblCategory[i]);
}
}
else
{
for (i = 5; i < (u32)min(m_max_categories + 1, 9); ++i)
{
m_btnMgr.hide(m_gameSettingsBtnCategory[i]);
m_btnMgr.hide(m_gameSettingsLblCategory[i]);
}
}
if (m_gameSettingsPage == 53)
{
for (i = 9; i < (u32)min(m_max_categories + 1, 12); ++i)
{
m_btnMgr.show(m_gameSettingsBtnCategory[i]);
m_btnMgr.show(m_gameSettingsLblCategory[i]);
}
}
else
{
for (i = 9; i < (u32)min(m_max_categories + 1, 12); ++i)
{
m_btnMgr.hide(m_gameSettingsBtnCategory[i]);
m_btnMgr.hide(m_gameSettingsLblCategory[i]);
}
}
to:
Code:
u32 i = 0;
switch (m_gameSettingsPage)
{
case GAME_SETTING_PAGE_1:
m_btnMgr.show(m_gameSettingsLblCover);
m_btnMgr.show(m_gameSettingsBtnCover);
m_btnMgr.show(m_gameSettingsBtnCategoryMain);
m_btnMgr.show(m_gameSettingsLblCategoryMain);
m_btnMgr.show(m_gameSettingsLblGameLanguage);
m_btnMgr.show(m_gameSettingsLblLanguage);
m_btnMgr.show(m_gameSettingsBtnLanguageP);
m_btnMgr.show(m_gameSettingsBtnLanguageM);
m_btnMgr.show(m_gameSettingsLblGameVideo);
m_btnMgr.show(m_gameSettingsLblVideo);
m_btnMgr.show(m_gameSettingsBtnVideoP);
m_btnMgr.show(m_gameSettingsBtnVideoM);
break;
case GAME_SETTING_PAGE_2:
m_btnMgr.show(m_gameSettingsLblDebugger);
m_btnMgr.show(m_gameSettingsLblDebuggerV);
m_btnMgr.show(m_gameSettingsBtnDebuggerP);
m_btnMgr.show(m_gameSettingsBtnDebuggerM);
m_btnMgr.show(m_gameSettingsLblHooktype);
m_btnMgr.show(m_gameSettingsLblHooktypeVal);
m_btnMgr.show(m_gameSettingsBtnHooktypeM);
m_btnMgr.show(m_gameSettingsBtnHooktypeP);
m_btnMgr.show(m_gameSettingsLblOcarina);
m_btnMgr.show(m_gameSettingsBtnOcarina);
m_btnMgr.show(m_gameSettingsLblCheat);
m_btnMgr.show(m_gameSettingsBtnCheat);
break;
case GAME_SETTING_PAGE_3:
m_btnMgr.show(m_gameSettingsLblPatchVidModes);
m_btnMgr.show(m_gameSettingsLblPatchVidModesVal);
m_btnMgr.show(m_gameSettingsBtnPatchVidModesM);
m_btnMgr.show(m_gameSettingsBtnPatchVidModesP);
m_btnMgr.show(m_gameSettingsLblVipatch);
m_btnMgr.show(m_gameSettingsBtnVipatch);
m_btnMgr.show(m_gameSettingsLblCountryPatch);
m_btnMgr.show(m_gameSettingsBtnCountryPatch);
if(m_current_view == COVERFLOW_USB)
{
m_btnMgr.show(m_gameSettingsLblEmulationVal);
m_btnMgr.show(m_gameSettingsLblEmulation);
m_btnMgr.show(m_gameSettingsBtnEmulationP);
m_btnMgr.show(m_gameSettingsBtnEmulationM);
}
break;
case GAME_SETTING_CATEGORY_PAGE_1:
for (i = 1; i < (u32)min(m_max_categories + 1, 5); ++i)
{
m_btnMgr.show(m_gameSettingsBtnCategory[i]);
m_btnMgr.show(m_gameSettingsLblCategory[i]);
}
break;
case GAME_SETTING_CATEGORY_PAGE_2:
for (i = 5; i < (u32)min(m_max_categories + 1, 9); ++i)
{
m_btnMgr.show(m_gameSettingsBtnCategory[i]);
m_btnMgr.show(m_gameSettingsLblCategory[i]);
}
break;
case GAME_SETTING_CATEGORY_PAGE_3:
for (i = 9; i < (u32)min(m_max_categories + 1, 12); ++i)
{
m_btnMgr.show(m_gameSettingsBtnCategory[i]);
m_btnMgr.show(m_gameSettingsLblCategory[i]);
}
break;
}
if (m_gameSettingsPage != m_gameSettingsPageLast)
switch (m_gameSettingsPageLast)
{
case GAME_SETTING_PAGE_1:
m_btnMgr.hide(m_gameSettingsLblCover);
m_btnMgr.hide(m_gameSettingsBtnCover);
m_btnMgr.hide(m_gameSettingsBtnCategoryMain);
m_btnMgr.hide(m_gameSettingsLblCategoryMain);
m_btnMgr.hide(m_gameSettingsLblGameLanguage);
m_btnMgr.hide(m_gameSettingsLblLanguage);
m_btnMgr.hide(m_gameSettingsBtnLanguageP);
m_btnMgr.hide(m_gameSettingsBtnLanguageM);
m_btnMgr.hide(m_gameSettingsLblGameVideo);
m_btnMgr.hide(m_gameSettingsLblVideo);
m_btnMgr.hide(m_gameSettingsBtnVideoP);
m_btnMgr.hide(m_gameSettingsBtnVideoM);
break;
case GAME_SETTING_PAGE_2:
m_btnMgr.hide(m_gameSettingsLblDebugger);
m_btnMgr.hide(m_gameSettingsLblDebuggerV);
m_btnMgr.hide(m_gameSettingsBtnDebuggerP);
m_btnMgr.hide(m_gameSettingsBtnDebuggerM);
m_btnMgr.hide(m_gameSettingsLblHooktype);
m_btnMgr.hide(m_gameSettingsLblHooktypeVal);
m_btnMgr.hide(m_gameSettingsBtnHooktypeM);
m_btnMgr.hide(m_gameSettingsBtnHooktypeP);
m_btnMgr.hide(m_gameSettingsLblOcarina);
m_btnMgr.hide(m_gameSettingsBtnOcarina);
m_btnMgr.hide(m_gameSettingsLblCheat);
m_btnMgr.hide(m_gameSettingsBtnCheat);
break;
case GAME_SETTING_PAGE_3:
m_btnMgr.hide(m_gameSettingsLblPatchVidModes);
m_btnMgr.hide(m_gameSettingsLblPatchVidModesVal);
m_btnMgr.hide(m_gameSettingsBtnPatchVidModesM);
m_btnMgr.hide(m_gameSettingsBtnPatchVidModesP);
m_btnMgr.hide(m_gameSettingsLblVipatch);
m_btnMgr.hide(m_gameSettingsBtnVipatch);
m_btnMgr.hide(m_gameSettingsLblCountryPatch);
m_btnMgr.hide(m_gameSettingsBtnCountryPatch);
m_btnMgr.hide(m_gameSettingsLblEmulationVal);
m_btnMgr.hide(m_gameSettingsLblEmulation);
m_btnMgr.hide(m_gameSettingsBtnEmulationP);
m_btnMgr.hide(m_gameSettingsBtnEmulationM);
break;
case GAME_SETTING_CATEGORY_PAGE_1:
for (i = 1; i < (u32)min(m_max_categories + 1, 5); ++i)
{
m_btnMgr.hide(m_gameSettingsBtnCategory[i]);
m_btnMgr.hide(m_gameSettingsLblCategory[i]);
}
break;
case GAME_SETTING_CATEGORY_PAGE_2:
for (i = 5; i < (u32)min(m_max_categories + 1, 9); ++i)
{
m_btnMgr.hide(m_gameSettingsBtnCategory[i]);
m_btnMgr.hide(m_gameSettingsLblCategory[i]);
}
break;
case GAME_SETTING_CATEGORY_PAGE_3:
for (i = 9; i < (u32)min(m_max_categories + 1, 12); ++i)
{
m_btnMgr.hide(m_gameSettingsBtnCategory[i]);
m_btnMgr.hide(m_gameSettingsLblCategory[i]);
}
break;