aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/Common/XUI/XUI_SettingsOptions.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/XUI/XUI_SettingsOptions.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/XUI/XUI_SettingsOptions.cpp')
-rw-r--r--Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp
index 683ee175..526847c7 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp
@@ -26,9 +26,9 @@ int CScene_SettingsOptions::m_iDifficultyTitleSettingA[4]=
HRESULT CScene_SettingsOptions::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
{
WCHAR TempString[256];
- m_iPad=*static_cast<int *>(pInitData->pvInitData);
+ m_iPad=*(int *)pInitData->pvInitData;
// if we're not in the game, we need to use basescene 0
- bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
+ bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
bool bPrimaryPlayer = ProfileManager.GetPrimaryPad()==m_iPad;
MapChildControls();
@@ -274,14 +274,14 @@ HRESULT CScene_SettingsOptions::OnNotifyValueChanged( HXUIOBJ hObjSource, XUINot
else
{
app.SetAutosaveTimerTime();
- swprintf( static_cast<WCHAR *>(TempString), 256, L"%ls: %d %ls", app.GetString( IDS_SLIDER_AUTOSAVE ),pNotifyValueChanged->nValue*15, app.GetString( IDS_MINUTES ));
+ swprintf( (WCHAR *)TempString, 256, L"%ls: %d %ls", app.GetString( IDS_SLIDER_AUTOSAVE ),pNotifyValueChanged->nValue*15, app.GetString( IDS_MINUTES ));
}
m_SliderA[SLIDER_SETTINGS_AUTOSAVE].SetText(TempString);
}
else if(hObjSource==m_SliderA[SLIDER_SETTINGS_DIFFICULTY].GetSlider() )
{
app.SetGameSettings(m_iPad,eGameSetting_Difficulty,pNotifyValueChanged->nValue);
- swprintf( static_cast<WCHAR *>(TempString), 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[pNotifyValueChanged->nValue]));
+ swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[pNotifyValueChanged->nValue]));
m_SliderA[SLIDER_SETTINGS_DIFFICULTY].SetText(TempString);
wstring wsText=app.GetString(m_iDifficultySettingA[pNotifyValueChanged->nValue]);
@@ -353,7 +353,7 @@ HRESULT CScene_SettingsOptions::OnControlNavigate(XUIMessageControlNavigate *pCo
// added so we can skip greyed out items
pControlNavigateData->hObjDest=XuiControlGetNavigation(pControlNavigateData->hObjSource,pControlNavigateData->nControlNavigate,TRUE,TRUE);
- if(pControlNavigateData->hObjDest!=nullptr)
+ if(pControlNavigateData->hObjDest!=NULL)
{
bHandled=TRUE;
}
@@ -467,7 +467,7 @@ HRESULT CScene_SettingsOptions::OnTransitionStart( XUIMessageTransition *pTransi
// Need to refresh the scenes visual since the object size has now changed
XuiControlAttachVisual(m_hObj);
- bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
+ bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
if(bNotInGame)
{