aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/Common/XUI/XUI_Death.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_Death.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_Death.cpp')
-rw-r--r--Minecraft.Client/Common/XUI/XUI_Death.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Minecraft.Client/Common/XUI/XUI_Death.cpp b/Minecraft.Client/Common/XUI/XUI_Death.cpp
index 1788ceff..83275c14 100644
--- a/Minecraft.Client/Common/XUI/XUI_Death.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Death.cpp
@@ -26,7 +26,7 @@
//----------------------------------------------------------------------------------
HRESULT CScene_Death::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
{
- m_iPad = *static_cast<int *>(pInitData->pvInitData);
+ m_iPad = *(int *)pInitData->pvInitData;
m_bIgnoreInput = false;
@@ -59,7 +59,7 @@ HRESULT CScene_Death::OnNotifySelChanged( HXUIOBJ hObjSource, XUINotifySelChange
XuiSetLocale( Languages[curSel].pszLanguagePath );
// Apply the locale to the main scene.
- XuiApplyLocale( m_hObj, nullptr );
+ XuiApplyLocale( m_hObj, NULL );
// Update the text for the current value.
m_Value.SetText( m_List.GetText( curSel ) );*/
@@ -105,9 +105,9 @@ HRESULT CScene_Death::OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress* pNoti
if(pNotifyPressData->UserIndex==ProfileManager.GetPrimaryPad())
{
int playTime = -1;
- if( pMinecraft->localplayers[pNotifyPressData->UserIndex] != nullptr )
+ if( pMinecraft->localplayers[pNotifyPressData->UserIndex] != NULL )
{
- playTime = static_cast<int>(pMinecraft->localplayers[pNotifyPressData->UserIndex]->getSessionTimer());
+ playTime = (int)pMinecraft->localplayers[pNotifyPressData->UserIndex]->getSessionTimer();
}
TelemetryManager->RecordLevelExit(pNotifyPressData->UserIndex, eSen_LevelExitStatus_Failed);