The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2024-11-30 15:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

- changed game settings menu to use main config buttons and labels.

Browse Source
This commit is contained in:
Fledge68 2022-08-05 15:04:05 -05:00
parent 626c46b7fa
commit e9649fc8d0
8 changed files with 522 additions and 864 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
out/boot.dol
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 MiB

After

Width:  |  Height:  |  Size: 4.3 MiB

93
source/menu/menu.cpp
View File

@ -1260,35 +1260,64 @@ void CMenu::_buildMenus(void)
// Build menus
_initMainMenu();
_initErrorMenu();
_initWad();
_initWBFSMenu();
_initConfigMenu();
_initConfigGCMenu();
_initPartitionsCfgMenu();
_initGameMenu();
_initDownloadMenu();
_initCodeMenu();
_initAboutMenu();
_initCFThemeMenu();
_initGameSettingsMenu();
_initCheatSettingsMenu();
_initSourceMenu();
_initConfigSrc();
_initConfigHB();
_initPluginSettingsMenu();
_initCategorySettingsMenu();
_initGameInfoMenu();
_initNandEmuMenu();
_initHomeAndExitToMenu();
_initCoverBanner();
_initExplorer();
_initBoot();
_initNandEmuMenu();
_initPartitionsCfgMenu();
_initPathsMenu();
_initDownloadMenu();
_initCodeMenu();
_initCFThemeMenu();
_initGameMenu();
_initGameInfoMenu();
_initConfigGameMenu();
_initCheatSettingsMenu();
_initCoverBanner();
_initWBFSMenu();
_initCategorySettingsMenu();
_initHomeAndExitToMenu();
_initAboutMenu();
_initExplorer();
_initWad();
_initSourceMenu();
_initPluginSettingsMenu();
_initCheckboxesMenu();
_loadCFCfg();
}
void CMenu::_updateText(void)
{
_textConfig();
_textConfigGC();
_textConfigSrc();
_textConfigHB();
_textBoot();
_textNandEmu();
_textPartitionsCfg();
_textPaths();
_textDownload();
_textCode();
_textGame();
_textConfigGame();
_textCheatSettings();
_textCoverBanner();
_textWBFS();
_textCategorySettings();
_textHome();
_textExitTo();
_textShutdown();
_textExplorer();
_textWad();
if(m_use_source)
_textSource();
_textPluginSettings();
_textCheckboxesMenu();
}
typedef struct
{
string ext;
@ -1969,34 +1998,6 @@ void CMenu::_drawBg(void)
GX_End();
}
void CMenu::_updateText(void)
{
if(m_use_source)
_textSource();
_textPluginSettings();
_textCategorySettings();
_textCheatSettings();
_textPartitionsCfg();
_textConfig();
_textConfigGC();
_textConfigHB();
_textConfigSrc();
_textBoot();
_textCoverBanner();
_textGame();
_textDownload();
_textCode();
_textWBFS();
_textGameSettings();
_textNandEmu();
_textHome();
_textExitTo();
_textShutdown();
_textExplorer();
_textWad();
_textCheckboxesMenu();
}
const wstringEx CMenu::_fmt(const char *key, const wchar_t *def)
{
wstringEx ws = m_loc.getWString(m_curLanguage, key, def);

108
source/menu/menu.hpp
View File

@ -431,104 +431,7 @@ private:
s16 m_gameSettingsBtnPageP;
s16 m_gameSettingsBtnBack;
s16 m_gameSettingsLblTitle;
s16 m_gameSettingsLblGameLanguage;
s16 m_gameSettingsLblLanguage;
s16 m_gameSettingsBtnLanguageP;
s16 m_gameSettingsBtnLanguageM;
s16 m_gameSettingsLblGameVideo;
s16 m_gameSettingsLblVideo;
s16 m_gameSettingsBtnVideoP;
s16 m_gameSettingsBtnVideoM;
s16 m_gameSettingsLblApploader;
s16 m_gameSettingsBtnApploader;
s16 m_gameSettingsLblLED;
s16 m_gameSettingsBtnLED;
s16 m_gameSettingsLblAspectRatio;
s16 m_gameSettingsLblAspectRatioVal;
s16 m_gameSettingsBtnAspectRatioP;
s16 m_gameSettingsBtnAspectRatioM;
s16 m_gameSettingsLblCustom;
s16 m_gameSettingsBtnCustom;
s16 m_gameSettingsLblLaunchNK;
s16 m_gameSettingsBtnLaunchNK;
s16 m_gameSettingsLblOcarina;
s16 m_gameSettingsBtnOcarina;
s16 m_gameSettingsLblVipatch;
s16 m_gameSettingsBtnVipatch;
s16 m_gameSettingsLblCountryPatch;
s16 m_gameSettingsBtnCountryPatch;
s16 m_gameSettingsLblPrivateServer;
s16 m_gameSettingsLblPrivateServerVal;
s16 m_gameSettingsBtnPrivateServerM;
s16 m_gameSettingsBtnPrivateServerP;
s16 m_gameSettingsLblFix480p;
s16 m_gameSettingsLblFix480pVal;
s16 m_gameSettingsBtnFix480pM;
s16 m_gameSettingsBtnFix480pP;
s16 m_gameSettingsLblWidescreenWiiu;
s16 m_gameSettingsLblWidescreenWiiuVal;
s16 m_gameSettingsBtnWidescreenWiiuM;
s16 m_gameSettingsBtnWidescreenWiiuP;
s16 m_gameSettingsLblDeflickerWii;
s16 m_gameSettingsLblDeflickerWiiVal;
s16 m_gameSettingsBtnDeflickerWiiM;
s16 m_gameSettingsBtnDeflickerWiiP;
s16 m_gameSettingsLblManage;
s16 m_gameSettingsBtnManage;
s16 m_gameSettingsLblPatchVidModes;
s16 m_gameSettingsLblPatchVidModesVal;
s16 m_gameSettingsBtnPatchVidModesM;
s16 m_gameSettingsBtnPatchVidModesP;
s16 m_gameSettingsLblUser[3 * 2];
s16 m_gameSettingsLblHooktype;
s16 m_gameSettingsLblHooktypeVal;
s16 m_gameSettingsBtnHooktypeM;
s16 m_gameSettingsBtnHooktypeP;
s16 m_gameSettingsLblEmulationVal;
s16 m_gameSettingsBtnEmulationP;
s16 m_gameSettingsBtnEmulationM;
s16 m_gameSettingsLblEmulation;
s16 m_gameSettingsLblDebugger;
s16 m_gameSettingsLblDebuggerV;
s16 m_gameSettingsBtnDebuggerP;
s16 m_gameSettingsBtnDebuggerM;
s16 m_gameSettingsLblCheat;
s16 m_gameSettingsBtnCheat;
s16 m_gameSettingsLblAdultOnly;
s16 m_gameSettingsBtnAdultOnly;
s16 m_gameSettingsLblGameIOS;
s16 m_gameSettingsLblIOS;
s16 m_gameSettingsBtnIOSP;
s16 m_gameSettingsBtnIOSM;
s16 m_gameSettingsLblExtractSave;
s16 m_gameSettingsBtnExtractSave;
s16 m_gameSettingsLblFlashSave;
s16 m_gameSettingsBtnFlashSave;
//Cheat menu
s16 m_cheatBtnBack;
s16 m_cheatBtnApply;
@ -811,7 +714,7 @@ private:
void _initCFThemeMenu();
void _initGameMenu();
void _initGameInfoMenu();
void _initGameSettingsMenu();
void _initConfigGameMenu();
void _initCheatSettingsMenu();
void _initCoverBanner();
void _initWBFSMenu();
@ -837,7 +740,7 @@ private:
void _textCode(void);
void _textGame(void);
void _textGameInfo(void);
void _textGameSettings(void);
void _textConfigGame(void);
void _textCheatSettings(void);
void _textCoverBanner(void);
void _textWBFS(void);
@ -868,8 +771,7 @@ private:
void _hideCFTheme(bool instant = false);
void _hideGame(bool instant = false);
void _hideGameInfo(bool instant = false);
void _hideGameSettings(bool instant = false);
void _hideGameSettingsPg(bool instant = false);
void _hideConfigGame(bool instant = true);
void _hideConfigGCGame(bool instant = true);
void _hideCheatSettings(bool instant = false);
void _hideCoverBanner(bool instant = true);
@ -901,7 +803,7 @@ private:
void _showCode(void);
void _showCFTheme(u32 curParam, int version, bool wide);
void _showGame(void);
void _showGameSettings(void);
void _showConfigGame(void);
void _showConfigGCGame(void);
void _showGameInfo(void);
void _showCheatSettings(void);
@ -933,7 +835,7 @@ private:
void _cfTheme(void);
void _game(bool launch = false);
bool _gameinfo(void);
void _gameSettings(const dir_discHdr *GameHdr, bool disc = false);
void _configGame(const dir_discHdr *GameHdr, bool disc = false);
void _configGCGame(const dir_discHdr *GameHdr, bool disc = false);
void _CheatSettings();
void _CoverBanner(void);

1100
source/menu/menu_config_game.cpp
View File

File diff suppressed because it is too large Load Diff

74
source/menu/menu_config_gc_game.cpp
View File

@ -92,7 +92,7 @@ void CMenu::_showConfigGCGame()
string id(GameHdr->id);
wstringEx title(_t("cfgg1", L"Settings"));
title.append(wfmt(L" [%s]", id));
title.append(wfmt(L" [%.6s]", id.c_str()));
m_btnMgr.setText(m_gameSettingsLblTitle, title);
m_btnMgr.show(m_gameSettingsLblTitle);
@ -375,10 +375,10 @@ void CMenu::_configGCGame(const dir_discHdr *hdr, bool disc)
{
if(m_configGCGamePage == 1)
{
//m_btnMgr.setText(m_configLbl1, _t("cfgg58", L"Adult only"));
//m_btnMgr.setText(m_configLbl2, _t("cfgg35", L"GameCube Loader"));
//m_btnMgr.setText(m_configLbl3, _t("cfgg2", L"Video mode"));
//m_btnMgr.setText(m_configLbl4, _t("cfgg3", L"Language"));
//Adult only
//GameCube Loader
//Video mode
//Language
if(m_btnMgr.selected(m_configBtn1))
{
if(disc)
@ -395,22 +395,22 @@ void CMenu::_configGCGame(const dir_discHdr *hdr, bool disc)
else if(m_btnMgr.selected(m_configBtn2P) || m_btnMgr.selected(m_configBtn2M))
{
s8 direction = m_btnMgr.selected(m_configBtn2P) ? 1 : -1;
m_gcfg2.setInt(id, "gc_loader", (int)loopNum(m_gcfg2.getUInt(id, "gc_loader", 0) + direction, ARRAY_SIZE(CMenu::_GCLoader)));
i = min(m_gcfg2.getUInt(id, "gc_loader", 0), ARRAY_SIZE(CMenu::_GCLoader) - 1u);
m_gcfg2.setInt(id, "gc_loader", loopNum(m_gcfg2.getUInt(id, "gc_loader", 0) + direction, ARRAY_SIZE(CMenu::_GCLoader)));
i = m_gcfg2.getUInt(id, "gc_loader");
m_btnMgr.setText(m_configLbl2Val, _t(CMenu::_GCLoader[i].id, CMenu::_GCLoader[i].text));
}
else if(m_btnMgr.selected(m_configBtn3P) || m_btnMgr.selected(m_configBtn3M))
{
s8 direction = m_btnMgr.selected(m_configBtn3P) ? 1 : -1;
m_gcfg2.setInt(id, "language", (int)loopNum(m_gcfg2.getUInt(id, "language", 0) + direction, ARRAY_SIZE(CMenu::_GClanguages)));
i = min(m_gcfg2.getUInt(id, "language", 0), ARRAY_SIZE(CMenu::_GClanguages) - 1u);
m_gcfg2.setInt(id, "language", loopNum(m_gcfg2.getUInt(id, "language", 0) + direction, ARRAY_SIZE(CMenu::_GClanguages)));
i = m_gcfg2.getUInt(id, "language");
m_btnMgr.setText(m_configLbl3Val, _t(CMenu::_GClanguages[i].id, CMenu::_GClanguages[i].text));
}
else if(m_btnMgr.selected(m_configBtn4P) || m_btnMgr.selected(m_configBtn4M))
{
s8 direction = m_btnMgr.selected(m_configBtn4P) ? 1 : -1;
m_gcfg2.setInt(id, "video_mode", (int)loopNum(m_gcfg2.getUInt(id, "video_mode", 0) + direction, ARRAY_SIZE(CMenu::_GCvideoModes)));
i = min(m_gcfg2.getUInt(id, "video_mode", 0), ARRAY_SIZE(CMenu::_GCvideoModes) - 1u);
m_gcfg2.setInt(id, "video_mode", loopNum(m_gcfg2.getUInt(id, "video_mode", 0) + direction, ARRAY_SIZE(CMenu::_GCvideoModes)));
i = m_gcfg2.getUInt(id, "video_mode");
m_btnMgr.setText(m_configLbl4Val, _t(CMenu::_GCvideoModes[i].id, CMenu::_GCvideoModes[i].text));
}
}
@ -418,10 +418,10 @@ void CMenu::_configGCGame(const dir_discHdr *hdr, bool disc)
{
if(GCLoader == DEVOLUTION)
{
//m_btnMgr.setText(m_configLbl1, _t("cfgg38", L"Activity LED"));
//m_btnMgr.setText(m_configLbl2, _t("cfgg47", L"Emulated MemCard"));
//m_btnMgr.setText(m_configLbl3, _t("cfgg36", L"Widescreen Patch"));
//m_btnMgr.setText(m_configLbl4, _t("cfgg40", L"Manage Cover and Banner"))
//Activity LED
//Emulated MemCard
//Widescreen Patch
//Manage Cover and Banner
if(m_btnMgr.selected(m_configBtn1))
{
m_gcfg2.setBool(id, "led", !m_gcfg2.getBool(id, "led", 0));
@ -453,15 +453,15 @@ void CMenu::_configGCGame(const dir_discHdr *hdr, bool disc)
}
else
{
//m_btnMgr.setText(m_configLbl1, _t("cfgg22", L"Debugger"));
//m_btnMgr.setText(m_configLbl2, _t("cfgg44", L"Video Deflicker"));
//m_btnMgr.setText(m_configLbl3, _t("cfgg5", L"Ocarina"));
//m_btnMgr.setText(m_configLbl4, _t("cfgg15", L"Cheat Codes"));
//Debugger
//Video Deflicker
//Ocarina
//Cheat Codes
if(m_btnMgr.selected(m_configBtn1P) || m_btnMgr.selected(m_configBtn1M))
{
s8 direction = m_btnMgr.selected(m_configBtn1P) ? 1 : -1;
m_gcfg2.setInt(id, "debugger", (int)loopNum(m_gcfg2.getUInt(id, "debugger", 0) + direction, ARRAY_SIZE(CMenu::_debugger)));
i = min(m_gcfg2.getUInt(id, "debugger", 0), ARRAY_SIZE(CMenu::_debugger) - 1u);
m_gcfg2.setInt(id, "debugger", loopNum(m_gcfg2.getUInt(id, "debugger", 0) + direction, ARRAY_SIZE(CMenu::_debugger)));
i = m_gcfg2.getUInt(id, "debugger");
m_btnMgr.setText(m_configLbl1Val, _t(CMenu::_debugger[i].id, CMenu::_debugger[i].text));
}
else if(m_btnMgr.selected(m_configBtn2))
@ -484,10 +484,10 @@ void CMenu::_configGCGame(const dir_discHdr *hdr, bool disc)
}
else if(m_configGCGamePage == 3)
{
//m_btnMgr.setText(m_configLbl1, _t("cfgg46", L"WiiU Widescreen"));
//m_btnMgr.setText(m_configLbl2, _t("cfgg47", L"Emulated MemCard"));
//m_btnMgr.setText(m_configLbl3, _t("cfgg36", L"Widescreen Patch"));
//m_btnMgr.setText(m_configLbl4, _t("cfgg40", L"Manage Cover and Banner"))
//WiiU Widescreen
//Emulated MemCard
//Widescreen Patch
//Manage Cover and Banner
if(m_btnMgr.selected(m_configBtn1))
{
m_gcfg2.setBool(id, "wiiu_widescreen", !m_gcfg2.getBool(id, "wiiu_widescreen", 0));
@ -496,8 +496,8 @@ void CMenu::_configGCGame(const dir_discHdr *hdr, bool disc)
else if(m_btnMgr.selected(m_configBtn2P) || m_btnMgr.selected(m_configBtn2M))
{
s8 direction = m_btnMgr.selected(m_configBtn2P) ? 1 : -1;
m_gcfg2.setInt(id, "emu_memcard", (int)loopNum(m_gcfg2.getUInt(id, "emu_memcard", 2) + direction, ARRAY_SIZE(CMenu::_NinEmuCard)));
i = min(m_gcfg2.getUInt(id, "emu_memcard", 0), ARRAY_SIZE(CMenu::_NinEmuCard) - 1u);
m_gcfg2.setInt(id, "emu_memcard", loopNum(m_gcfg2.getUInt(id, "emu_memcard", 2) + direction, ARRAY_SIZE(CMenu::_NinEmuCard)));
i = m_gcfg2.getUInt(id, "emu_memcard");
m_btnMgr.setText(m_configLbl2Val, _t(CMenu::_NinEmuCard[i].id, CMenu::_NinEmuCard[i].text));
}
else if(m_btnMgr.selected(m_configBtn3))
@ -521,10 +521,10 @@ void CMenu::_configGCGame(const dir_discHdr *hdr, bool disc)
}
else if(m_configGCGamePage == 4)
{
//m_btnMgr.setText(m_configLbl1, _t("cfgg52", L"Wiimote CC Rumble"));
//m_btnMgr.setText(m_configLbl2, _t("cfgg43", L"Native Control"));
//m_btnMgr.setText(m_configLbl3, _t("cfgg48", L"Triforce Arcade Mode"));
//m_btnMgr.setText(m_configLbl4, _t("cfgg53", L"Skip IPL BIOS"));
//Wiimote CC Rumble
//Native Control
//Triforce Arcade Mode
//Skip IPL BIOS
if(m_btnMgr.selected(m_configBtn1))
{
m_gcfg2.setOptBool(id, "cc_rumble", loopNum(m_gcfg2.getOptBool(id, "cc_rumble") + 1, 3));
@ -548,10 +548,10 @@ void CMenu::_configGCGame(const dir_discHdr *hdr, bool disc)
}
else if(m_configGCGamePage == 5)
{
//m_btnMgr.setText(m_configLbl1, _t("cfgg38", L"Activity LED"));
//m_btnMgr.setText(m_configLbl2, _t("cfgg54", L"Video Width"));
//m_btnMgr.setText(m_configLbl3, _t("cfgg55", L"Video Position"));
//m_btnMgr.setText(m_configLbl4, _t("cfgg56", L"Patch PAL50"));
//Activity LED
//Video Width
//Video Position
//Patch PAL50
if(m_btnMgr.selected(m_configBtn1))
{
m_gcfg2.setBool(id, "led", !m_gcfg2.getBool(id, "led", 0));
@ -615,8 +615,8 @@ void CMenu::_configGCGame(const dir_discHdr *hdr, bool disc)
}
else
{
//m_btnMgr.setText(m_configLbl1, _t("cfgg59", L"BBA Emulation"));
//m_btnMgr.setText(m_configLbl2, _t("cfgg60", L"BBA Net Profile"));
//BBA Emulation
//BBA Net Profile
if(m_btnMgr.selected(m_configBtn1))
{
m_gcfg2.setBool(id, "bba_emu", !m_gcfg2.getBool(id, "bba_emu", 0));

2
source/menu/menu_error.cpp
View File

@ -39,7 +39,7 @@ void CMenu::_error(const wstringEx &msg)
_hideCFTheme();
_hideCategorySettings();
_hideGameInfo();
_hideGameSettings();
_hideConfigGame();
_hideWaitMessage();
m_btnMgr.setText(m_errorLblMessage, msg, true);
_showError();

5
source/menu/menu_game.cpp
View File

@ -422,7 +422,10 @@ void CMenu::_game(bool launch)
// the mainloop handles drawing banner while in settings
m_banner.ToggleZoom();//zoom to full
m_banner.ToggleGameSettings();// dim brightness
_gameSettings(hdr);
if(hdr->type == TYPE_GC_GAME)
_configGCGame(hdr);
else
_configGame(hdr);
m_banner.ToggleGameSettings();//reset brightness
m_banner.ToggleZoom();//de zoom to small
}

4
source/menu/menu_game_boot.cpp
View File

@ -1023,7 +1023,7 @@ void CMenu::_launchWii(dir_discHdr *hdr, bool dvd, bool disc_cfg)
/* go to game settings menu if wanted to make changes */
if(disc_cfg)
_gameSettings(hdr, dvd);
_configGCGame(hdr, dvd);
/* prepare to launch GC disc */
MusicPlayer.Stop();
@ -1047,7 +1047,7 @@ void CMenu::_launchWii(dir_discHdr *hdr, bool dvd, bool disc_cfg)
/* go to game settings menu if wanted to make changes */
if(disc_cfg)
_gameSettings(hdr, dvd);
_configGame(hdr, dvd);
/* prepare to launch Wii disc */
MusicPlayer.Stop();