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.World/FireworksMenu.cpp
View File

@@ -15,8 +15,8 @@ FireworksMenu::FireworksMenu(shared_ptr<Inventory> inventory, Level *level, int
m_canMakeCharge = false;
m_canMakeFade = false;
craftSlots = std::make_shared<CraftingContainer>(this, 3, 3);
resultSlots = std::make_shared<ResultContainer>();
craftSlots = shared_ptr<CraftingContainer>( new CraftingContainer(this, 3, 3) );
resultSlots = shared_ptr<ResultContainer>( new ResultContainer() );
this->level = level;
x = xt;
@@ -61,7 +61,7 @@ void FireworksMenu::removed(shared_ptr<Player> player)
for (int i = 0; i < 9; i++)
{
shared_ptr<ItemInstance> item = craftSlots->removeItemNoUpdate(i);
if (item != nullptr)
if (item != NULL)
{
player->drop(item);
}
@@ -77,7 +77,7 @@ shared_ptr<ItemInstance> FireworksMenu::quickMoveStack(shared_ptr<Player> player
{
shared_ptr<ItemInstance> clicked = nullptr;
Slot *slot = slots.at(slotIndex);
if (slot != nullptr && slot->hasItem())
if (slot != NULL && slot->hasItem())
{
shared_ptr<ItemInstance> stack = slot->getItem();
clicked = stack->copy();
@@ -145,6 +145,6 @@ bool FireworksMenu::canTakeItemForPickAll(shared_ptr<ItemInstance> carried, Slot
bool FireworksMenu::isValidIngredient(shared_ptr<ItemInstance> item, int slotId)
{
if(item == nullptr || slotId == RESULT_SLOT) return true;
if(item == NULL || slotId == RESULT_SLOT) return true;
return FireworksRecipe::isValidIngredient(item, m_canMakeFireworks, m_canMakeCharge, m_canMakeFade);
}