diff options
| author | Loki Rautio <lokirautio@gmail.com> | 2026-03-07 21:12:22 -0600 |
|---|---|---|
| committer | Loki Rautio <lokirautio@gmail.com> | 2026-03-07 21:12:22 -0600 |
| commit | 087b7e7abfe81dd7f0fdcdea36ac9f245950df1a (patch) | |
| tree | 69454763e73ca764af4e682d3573080b13138a0e /Minecraft.World/FireworksMenu.cpp | |
| parent | a9be52c41a02d207233199e98898fe7483d7e817 (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.World/FireworksMenu.cpp')
| -rw-r--r-- | Minecraft.World/FireworksMenu.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.World/FireworksMenu.cpp b/Minecraft.World/FireworksMenu.cpp index cd9196af..68c9e0f2 100644 --- a/Minecraft.World/FireworksMenu.cpp +++ b/Minecraft.World/FireworksMenu.cpp @@ -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); }
\ No newline at end of file |