aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/InventoryMenu.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-08 19:08:36 -0400
committerGitHub <noreply@github.com>2026-03-08 18:08:36 -0500
commit28614b922fb77149a54da1a87bebfbc98736f296 (patch)
tree7f828ba86a4ee18d0a80d29de64f6199a5412512 /Minecraft.World/InventoryMenu.cpp
parent88798b501d0cf6287b6f87acb2592676e3cec58d (diff)
Modernize project codebase (#906)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides * Add safety checks and fix a issue with vector going OOR
Diffstat (limited to 'Minecraft.World/InventoryMenu.cpp')
-rw-r--r--Minecraft.World/InventoryMenu.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.World/InventoryMenu.cpp b/Minecraft.World/InventoryMenu.cpp
index ae5d9269..9c6c661f 100644
--- a/Minecraft.World/InventoryMenu.cpp
+++ b/Minecraft.World/InventoryMenu.cpp
@@ -28,8 +28,8 @@ InventoryMenu::InventoryMenu(shared_ptr<Inventory> inventory, bool active, Playe
void InventoryMenu::_init(shared_ptr<Inventory> inventory, bool active)
{
- craftSlots = shared_ptr<CraftingContainer>( new CraftingContainer(this, 2, 2) );
- resultSlots = shared_ptr<ResultContainer>( new ResultContainer() );
+ craftSlots = std::make_shared<CraftingContainer>(this, 2, 2);
+ resultSlots = std::make_shared<ResultContainer>();
this->active = active;
addSlot(new ResultSlot( inventory->player, craftSlots, resultSlots, 0, 144, 36));
@@ -77,7 +77,7 @@ void InventoryMenu::removed(shared_ptr<Player> player)
for (int i = 0; i < 4; i++)
{
shared_ptr<ItemInstance> item = craftSlots->removeItemNoUpdate(i);
- if (item != NULL)
+ if (item != nullptr)
{
player->drop(item);
craftSlots->setItem(i, nullptr);
@@ -102,7 +102,7 @@ shared_ptr<ItemInstance> InventoryMenu::quickMoveStack(shared_ptr<Player> player
Slot *BootsSlot = slots.at(ARMOR_SLOT_START+3);
- if (slot != NULL && slot->hasItem())
+ if (slot != nullptr && slot->hasItem())
{
shared_ptr<ItemInstance> stack = slot->getItem();
clicked = stack->copy();
@@ -240,7 +240,7 @@ shared_ptr<ItemInstance> InventoryMenu::clicked(int slotIndex, int buttonNum, in
for (int i = ARMOR_SLOT_START; i < ARMOR_SLOT_END; i++)
{
Slot *slot = slots.at(i);
- if ( (slot==NULL) || (!slot->hasItem()) || (slot->getItem()->getItem()->id != ironItems[i-ARMOR_SLOT_START]) )
+ if ( (slot==nullptr) || (!slot->hasItem()) || (slot->getItem()->getItem()->id != ironItems[i-ARMOR_SLOT_START]) )
{
return out;
}