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

10
Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp
View File

@@ -13,7 +13,7 @@
UIScene_ContainerMenu::UIScene_ContainerMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
{
ContainerScreenInput *initData = static_cast<ContainerScreenInput *>(_initData);
ContainerScreenInput *initData = (ContainerScreenInput *)_initData;
m_bLargeChest = (initData->container->getContainerSize() > 3*9)?true:false;
// Setup all the Iggy references we need for this scene
@@ -24,9 +24,9 @@ UIScene_ContainerMenu::UIScene_ContainerMenu(int iPad, void *_initData, UILayer
ContainerMenu* menu = new ContainerMenu( initData->inventory, initData->container );
Minecraft *pMinecraft = Minecraft::GetInstance();
if( pMinecraft->localgameModes[iPad] != nullptr )
if( pMinecraft->localgameModes[iPad] != NULL )
{
TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[initData->iPad]);
TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Container_Menu, this);
}
@@ -181,7 +181,7 @@ void UIScene_ContainerMenu::setSectionSelectedSlot(ESceneSection eSection, int x
int index = (y * cols) + x;
UIControl_SlotList *slotList = nullptr;
UIControl_SlotList *slotList = NULL;
switch( eSection )
{
case eSectionContainerChest:
@@ -203,7 +203,7 @@ void UIScene_ContainerMenu::setSectionSelectedSlot(ESceneSection eSection, int x
UIControl *UIScene_ContainerMenu::getSection(ESceneSection eSection)
{
UIControl *control = nullptr;
UIControl *control = NULL;
switch( eSection )
{
case eSectionContainerChest: