mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-06-30 08:41:25 +00:00
TU19: merge Minecraft.Client/Platform/Common/UI
This commit is contained in:
@@ -11,19 +11,14 @@ UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void* initData,
|
||||
|
||||
m_bNotInGame = (Minecraft::GetInstance()->level == NULL);
|
||||
|
||||
m_buttons[BUTTON_HAO_CHANGESKIN].init(app.GetString(IDS_CHANGE_SKIN),
|
||||
m_buttons[BUTTON_HAO_CHANGESKIN].init(IDS_CHANGE_SKIN,
|
||||
BUTTON_HAO_CHANGESKIN);
|
||||
m_buttons[BUTTON_HAO_HOWTOPLAY].init(app.GetString(IDS_HOW_TO_PLAY),
|
||||
BUTTON_HAO_HOWTOPLAY);
|
||||
m_buttons[BUTTON_HAO_CONTROLS].init(app.GetString(IDS_CONTROLS),
|
||||
BUTTON_HAO_CONTROLS);
|
||||
m_buttons[BUTTON_HAO_SETTINGS].init(app.GetString(IDS_SETTINGS),
|
||||
BUTTON_HAO_SETTINGS);
|
||||
m_buttons[BUTTON_HAO_CREDITS].init(app.GetString(IDS_CREDITS),
|
||||
BUTTON_HAO_CREDITS);
|
||||
m_buttons[BUTTON_HAO_HOWTOPLAY].init(IDS_HOW_TO_PLAY, BUTTON_HAO_HOWTOPLAY);
|
||||
m_buttons[BUTTON_HAO_CONTROLS].init(IDS_CONTROLS, BUTTON_HAO_CONTROLS);
|
||||
m_buttons[BUTTON_HAO_SETTINGS].init(IDS_SETTINGS, BUTTON_HAO_SETTINGS);
|
||||
m_buttons[BUTTON_HAO_CREDITS].init(IDS_CREDITS, BUTTON_HAO_CREDITS);
|
||||
// m_buttons[BUTTON_HAO_REINSTALL].init(app.GetString(IDS_REINSTALL_CONTENT),BUTTON_HAO_REINSTALL);
|
||||
m_buttons[BUTTON_HAO_DEBUG].init(app.GetString(IDS_DEBUG_SETTINGS),
|
||||
BUTTON_HAO_DEBUG);
|
||||
m_buttons[BUTTON_HAO_DEBUG].init(IDS_DEBUG_SETTINGS, BUTTON_HAO_DEBUG);
|
||||
|
||||
/* 4J-TomK - we should never remove a control before the other buttons
|
||||
controls are initialised! (because vita touchboxes are rebuilt on remove
|
||||
@@ -31,8 +26,6 @@ UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void* initData,
|
||||
// We don't have a reinstall content, so remove the button
|
||||
removeControl(&m_buttons[BUTTON_HAO_REINSTALL], false);
|
||||
|
||||
doHorizontalResizeCheck();
|
||||
|
||||
#ifdef _FINAL_BUILD
|
||||
removeControl(&m_buttons[BUTTON_HAO_DEBUG], false);
|
||||
#else
|
||||
@@ -80,6 +73,11 @@ UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void* initData,
|
||||
removeControl(&m_buttons[BUTTON_HAO_CHANGESKIN], false);
|
||||
}
|
||||
|
||||
// 4J-TomK Moved horizontal resize check to the end to prevent horizontal
|
||||
// scaling for buttons that might get removed anyways (debug options for
|
||||
// example)
|
||||
doHorizontalResizeCheck();
|
||||
|
||||
// StorageManager.TMSPP_GetUserQuotaInfo(C4JStorage::eGlobalStorage_TitleUser,iPad);
|
||||
// StorageManager.WebServiceRequestGetFriends(iPad);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user