aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/Common/UI/UIScene_DeathMenu.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_DeathMenu.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_DeathMenu.cpp')
-rw-r--r--Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp
index a4dbe8a8..8f0f4c11 100644
--- a/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp
@@ -18,9 +18,9 @@ UIScene_DeathMenu::UIScene_DeathMenu(int iPad, void *initData, UILayer *parentLa
m_bIgnoreInput = false;
Minecraft *pMinecraft = Minecraft::GetInstance();
- if(pMinecraft != nullptr && pMinecraft->localgameModes[iPad] != nullptr )
+ if(pMinecraft != NULL && pMinecraft->localgameModes[iPad] != NULL )
{
- TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[iPad]);
+ TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[iPad];
// This just allows it to be shown
gameMode->getTutorial()->showTutorialPopup(false);
@@ -30,9 +30,9 @@ UIScene_DeathMenu::UIScene_DeathMenu(int iPad, void *initData, UILayer *parentLa
UIScene_DeathMenu::~UIScene_DeathMenu()
{
Minecraft *pMinecraft = Minecraft::GetInstance();
- if(pMinecraft != nullptr && pMinecraft->localgameModes[m_iPad] != nullptr )
+ if(pMinecraft != NULL && pMinecraft->localgameModes[m_iPad] != NULL )
{
- TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[m_iPad]);
+ TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
// This just allows it to be shown
gameMode->getTutorial()->showTutorialPopup(true);
@@ -81,7 +81,7 @@ void UIScene_DeathMenu::handleInput(int iPad, int key, bool repeat, bool pressed
void UIScene_DeathMenu::handlePress(F64 controlId, F64 childId)
{
- switch(static_cast<int>(controlId))
+ switch((int)controlId)
{
case eControl_Respawn:
m_bIgnoreInput = true;
@@ -104,9 +104,9 @@ void UIScene_DeathMenu::handlePress(F64 controlId, F64 childId)
{
UINT uiIDA[3];
int playTime = -1;
- if( pMinecraft->localplayers[m_iPad] != nullptr )
+ if( pMinecraft->localplayers[m_iPad] != NULL )
{
- playTime = static_cast<int>(pMinecraft->localplayers[m_iPad]->getSessionTimer());
+ playTime = (int)pMinecraft->localplayers[m_iPad]->getSessionTimer();
}
TelemetryManager->RecordLevelExit(m_iPad, eSen_LevelExitStatus_Failed);