Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Project modernization (#630)"

Browse Source 
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.

This reverts commit a9be52c41a.
This commit is contained in:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp
View File

@@ -8,7 +8,7 @@ UIScene_SettingsMenu::UIScene_SettingsMenu(int iPad, void *initData, UILayer *pa
// Setup all the Iggy references we need for this scene
initialiseMovie();
bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
m_buttons[BUTTON_ALL_OPTIONS].init(IDS_OPTIONS,BUTTON_ALL_OPTIONS);
m_buttons[BUTTON_ALL_AUDIO].init(IDS_AUDIO,BUTTON_ALL_AUDIO);
@@ -51,7 +51,7 @@ wstring UIScene_SettingsMenu::getMoviePath()
void UIScene_SettingsMenu::handleReload()
{
bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
if(ProfileManager.GetPrimaryPad()!=m_iPad)
{
removeControl( &m_buttons[BUTTON_ALL_AUDIO], bNotInGame);
@@ -68,7 +68,7 @@ void UIScene_SettingsMenu::updateTooltips()
void UIScene_SettingsMenu::updateComponents()
{
bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
if(bNotInGame)
{
m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true);
@@ -119,7 +119,7 @@ void UIScene_SettingsMenu::handlePress(F64 controlId, F64 childId)
//CD - Added for audio
ui.PlayUISFX(eSFX_Press);
switch(static_cast<int>(controlId))
switch((int)controlId)
{
case BUTTON_ALL_OPTIONS:
ui.NavigateToScene(m_iPad, eUIScene_SettingsOptionsMenu);
@@ -151,7 +151,7 @@ void UIScene_SettingsMenu::handlePress(F64 controlId, F64 childId)
int UIScene_SettingsMenu::ResetDefaultsDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
{
UIScene_SettingsMenu* pClass = static_cast<UIScene_SettingsMenu *>(pParam);
UIScene_SettingsMenu* pClass = (UIScene_SettingsMenu*)pParam;
// results switched for this dialog
if(result==C4JStorage::EMessage_ResultDecline)