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

24
Minecraft.Client/Common/UI/UIScene_BeaconMenu.cpp
View File

@@ -21,12 +21,12 @@ UIScene_BeaconMenu::UIScene_BeaconMenu(int iPad, void *_initData, UILayer *paren
m_buttonsPowers[eControl_Secondary1].setVisible(false);
m_buttonsPowers[eControl_Secondary2].setVisible(false);
BeaconScreenInput *initData = static_cast<BeaconScreenInput *>(_initData);
BeaconScreenInput *initData = (BeaconScreenInput *)_initData;
Minecraft *pMinecraft = Minecraft::GetInstance();
if( pMinecraft->localgameModes[initData->iPad] != nullptr )
if( pMinecraft->localgameModes[initData->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_Beacon_Menu, this);
}
@@ -254,7 +254,7 @@ void UIScene_BeaconMenu::setSectionSelectedSlot(ESceneSection eSection, int x, i
int index = (y * cols) + x;
UIControl_SlotList *slotList = nullptr;
UIControl_SlotList *slotList = NULL;
switch( eSection )
{
case eSectionBeaconItem:
@@ -276,7 +276,7 @@ void UIScene_BeaconMenu::setSectionSelectedSlot(ESceneSection eSection, int x, i
UIControl *UIScene_BeaconMenu::getSection(ESceneSection eSection)
{
UIControl *control = nullptr;
UIControl *control = NULL;
switch( eSection )
{
case eSectionBeaconItem:
@@ -324,11 +324,11 @@ UIControl *UIScene_BeaconMenu::getSection(ESceneSection eSection)
void UIScene_BeaconMenu::customDraw(IggyCustomDrawCallbackRegion *region)
{
Minecraft *pMinecraft = Minecraft::GetInstance();
if(pMinecraft->localplayers[m_iPad] == nullptr || pMinecraft->localgameModes[m_iPad] == nullptr) return;
if(pMinecraft->localplayers[m_iPad] == NULL || pMinecraft->localgameModes[m_iPad] == NULL) return;
shared_ptr<ItemInstance> item = nullptr;
int slotId = -1;
swscanf(static_cast<wchar_t *>(region->name),L"slot_%d",&slotId);
swscanf((wchar_t*)region->name,L"slot_%d",&slotId);
if(slotId >= 0 && slotId >= m_menu->getSize() )
{
@@ -336,22 +336,22 @@ void UIScene_BeaconMenu::customDraw(IggyCustomDrawCallbackRegion *region)
switch(icon)
{
case 0:
item = std::make_shared<ItemInstance>(Item::emerald);
item = shared_ptr<ItemInstance>(new ItemInstance(Item::emerald) );
break;
case 1:
item = std::make_shared<ItemInstance>(Item::diamond);
item = shared_ptr<ItemInstance>(new ItemInstance(Item::diamond) );
break;
case 2:
item = std::make_shared<ItemInstance>(Item::goldIngot);
item = shared_ptr<ItemInstance>(new ItemInstance(Item::goldIngot) );
break;
case 3:
item = std::make_shared<ItemInstance>(Item::ironIngot);
item = shared_ptr<ItemInstance>(new ItemInstance(Item::ironIngot) );
break;
default:
assert(false);
break;
};
if(item != nullptr) customDrawSlotControl(region,m_iPad,item,1.0f,item->isFoil(),true);
if(item != NULL) customDrawSlotControl(region,m_iPad,item,1.0f,item->isFoil(),true);
}
else
{