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

11
Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp
View File

@@ -4,6 +4,7 @@
#include "..\..\Minecraft.h"
#include "..\..\ProgressRenderer.h"
UIScene_FullscreenProgress::UIScene_FullscreenProgress(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
{
// Setup all the Iggy references we need for this scene
@@ -26,7 +27,7 @@ UIScene_FullscreenProgress::UIScene_FullscreenProgress(int iPad, void *initData,
m_buttonConfirm.init( app.GetString( IDS_CONFIRM_OK ), eControl_Confirm );
m_buttonConfirm.setVisible(false);
LoadingInputParams *params = static_cast<LoadingInputParams *>(initData);
LoadingInputParams *params = (LoadingInputParams *)initData;
m_CompletionData = params->completionData;
m_iPad=params->completionData->iPad;
@@ -101,7 +102,7 @@ void UIScene_FullscreenProgress::handleDestroy()
DWORD exitcode = *((DWORD *)&code);
// If we're active, have a cancel func, and haven't already cancelled, call cancel func
if( exitcode == STILL_ACTIVE && m_cancelFunc != nullptr && !m_bWasCancelled)
if( exitcode == STILL_ACTIVE && m_cancelFunc != NULL && !m_bWasCancelled)
{
m_bWasCancelled = true;
m_cancelFunc(m_cancelFuncParam);
@@ -223,7 +224,7 @@ void UIScene_FullscreenProgress::tick()
// This just allows it to be shown
Minecraft *pMinecraft = Minecraft::GetInstance();
if(pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()] != nullptr) pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()]->getTutorial()->showTutorialPopup(true);
if(pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()] != NULL) pMinecraft->localgameModes[ProfileManager.GetPrimaryPad()]->getTutorial()->showTutorialPopup(true);
ui.UpdatePlayerBasePositions();
navigateBack();
}
@@ -285,7 +286,7 @@ void UIScene_FullscreenProgress::handleInput(int iPad, int key, bool repeat, boo
break;
case ACTION_MENU_B:
case ACTION_MENU_CANCEL:
if( pressed && m_cancelFunc != nullptr && !m_bWasCancelled )
if( pressed && m_cancelFunc != NULL && !m_bWasCancelled )
{
m_bWasCancelled = true;
m_cancelFunc( m_cancelFuncParam );
@@ -297,7 +298,7 @@ void UIScene_FullscreenProgress::handleInput(int iPad, int key, bool repeat, boo
void UIScene_FullscreenProgress::handlePress(F64 controlId, F64 childId)
{
if(m_threadCompleted && static_cast<int>(controlId) == eControl_Confirm)
if(m_threadCompleted && (int)controlId == eControl_Confirm)
{
// This assumes all buttons can only be pressed with the A button
ui.AnimateKeyPress(m_iPad, ACTION_MENU_A, false, true, false);