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

12
Minecraft.Client/Common/XUI/XUI_SettingsUI.cpp
View File

@@ -10,9 +10,9 @@
HRESULT CScene_SettingsUI::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();
@@ -115,7 +115,7 @@ HRESULT CScene_SettingsUI::OnNotifyValueChanged( HXUIOBJ hObjSource, XUINotifyVa
// slider is 1 to 3
// is this different from the current value?
swprintf( static_cast<WCHAR *>(TempString), 256, L"%ls: %d", app.GetString( IDS_SLIDER_UISIZE ),pNotifyValueChanged->nValue);
swprintf( (WCHAR *)TempString, 256, L"%ls: %d", app.GetString( IDS_SLIDER_UISIZE ),pNotifyValueChanged->nValue);
m_SliderA[SLIDER_SETTINGS_UISIZE].SetText(TempString);
if(pNotifyValueChanged->nValue != app.GetGameSettings(m_iPad,eGameSetting_UISize)+1)
{
@@ -126,7 +126,7 @@ HRESULT CScene_SettingsUI::OnNotifyValueChanged( HXUIOBJ hObjSource, XUINotifyVa
}
else if(hObjSource==m_SliderA[SLIDER_SETTINGS_UISIZESPLITSCREEN].GetSlider() )
{
swprintf( static_cast<WCHAR *>(TempString), 256, L"%ls: %d", app.GetString( IDS_SLIDER_UISIZESPLITSCREEN ),pNotifyValueChanged->nValue);
swprintf( (WCHAR *)TempString, 256, L"%ls: %d", app.GetString( IDS_SLIDER_UISIZESPLITSCREEN ),pNotifyValueChanged->nValue);
m_SliderA[SLIDER_SETTINGS_UISIZESPLITSCREEN].SetText(TempString);
if(pNotifyValueChanged->nValue != app.GetGameSettings(m_iPad,eGameSetting_UISizeSplitscreen)+1)
@@ -210,7 +210,7 @@ HRESULT CScene_SettingsUI::OnControlNavigate(XUIMessageControlNavigate *pControl
// 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;
}
@@ -353,7 +353,7 @@ HRESULT CScene_SettingsUI::OnTransitionStart( XUIMessageTransition *pTransition,
HRESULT CScene_SettingsUI::OnNavReturn(HXUIOBJ hObj,BOOL& rfHandled)
{
bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
// if we're not in the game, we need to use basescene 0
if(bNotInGame)