aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/Common/UI/UIScene_SettingsUIMenu.cpp
diff options
context:
space:
mode:
authorLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
committerLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
commit087b7e7abfe81dd7f0fdcdea36ac9f245950df1a (patch)
tree69454763e73ca764af4e682d3573080b13138a0e /Minecraft.Client/Common/UI/UIScene_SettingsUIMenu.cpp
parenta9be52c41a02d207233199e98898fe7483d7e817 (diff)
Revert "Project modernization (#630)"
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 a9be52c41a02d207233199e98898fe7483d7e817.
Diffstat (limited to 'Minecraft.Client/Common/UI/UIScene_SettingsUIMenu.cpp')
-rw-r--r--Minecraft.Client/Common/UI/UIScene_SettingsUIMenu.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsUIMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SettingsUIMenu.cpp
index 873564f6..917012d6 100644
--- a/Minecraft.Client/Common/UI/UIScene_SettingsUIMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SettingsUIMenu.cpp
@@ -7,7 +7,7 @@ UIScene_SettingsUIMenu::UIScene_SettingsUIMenu(int iPad, void *initData, UILayer
// Setup all the Iggy references we need for this scene
initialiseMovie();
- m_bNotInGame=(Minecraft::GetInstance()->level==nullptr);
+ m_bNotInGame=(Minecraft::GetInstance()->level==NULL);
m_checkboxDisplayHUD.init(app.GetString(IDS_CHECKBOX_DISPLAY_HUD),eControl_DisplayHUD,(app.GetGameSettings(m_iPad,eGameSetting_DisplayHUD)!=0));
m_checkboxDisplayHand.init(app.GetString(IDS_CHECKBOX_DISPLAY_HAND),eControl_DisplayHand,(app.GetGameSettings(m_iPad,eGameSetting_DisplayHand)!=0));
@@ -26,7 +26,7 @@ UIScene_SettingsUIMenu::UIScene_SettingsUIMenu(int iPad, void *initData, UILayer
doHorizontalResizeCheck();
- bool bInGame=(Minecraft::GetInstance()->level!=nullptr);
+ bool bInGame=(Minecraft::GetInstance()->level!=NULL);
bool bPrimaryPlayer = ProfileManager.GetPrimaryPad()==m_iPad;
// if we're not in the game, we need to use basescene 0
@@ -57,7 +57,7 @@ void UIScene_SettingsUIMenu::updateTooltips()
void UIScene_SettingsUIMenu::updateComponents()
{
- bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
+ bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
if(bNotInGame)
{
m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true);
@@ -146,8 +146,8 @@ void UIScene_SettingsUIMenu::handleInput(int iPad, int key, bool repeat, bool pr
void UIScene_SettingsUIMenu::handleSliderMove(F64 sliderId, F64 currentValue)
{
WCHAR TempString[256];
- int value = static_cast<int>(currentValue);
- switch(static_cast<int>(sliderId))
+ int value = (int)currentValue;
+ switch((int)sliderId)
{
case eControl_UISize:
m_sliderUISize.handleSliderMove(value);