aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/CraftingContainer.cpp
diff options
context:
space:
mode:
authorvoid_17 <heroerror3@gmail.com>2026-03-02 17:37:16 +0700
committervoid_17 <heroerror3@gmail.com>2026-03-02 17:37:16 +0700
commit119bff351450ea16ffda550b6e0f67379b29f708 (patch)
treed9f28714afd516bc2450f33b0a77c5e05ff4de90 /Minecraft.World/CraftingContainer.cpp
parent8a2a62ea1d47364f802cf9aae97668bc4a7007b5 (diff)
Revert "shared_ptr -> std::shared_ptr"
This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5.
Diffstat (limited to 'Minecraft.World/CraftingContainer.cpp')
-rw-r--r--Minecraft.World/CraftingContainer.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/Minecraft.World/CraftingContainer.cpp b/Minecraft.World/CraftingContainer.cpp
index db0d593d..fbcc5678 100644
--- a/Minecraft.World/CraftingContainer.cpp
+++ b/Minecraft.World/CraftingContainer.cpp
@@ -22,7 +22,7 @@ unsigned int CraftingContainer::getContainerSize()
return items->length;
}
-std::shared_ptr<ItemInstance> CraftingContainer::getItem(unsigned int slot)
+shared_ptr<ItemInstance> CraftingContainer::getItem(unsigned int slot)
{
if (slot >= getContainerSize())
{
@@ -31,7 +31,7 @@ std::shared_ptr<ItemInstance> CraftingContainer::getItem(unsigned int slot)
return (*items)[slot];
}
-std::shared_ptr<ItemInstance> CraftingContainer::getItem(unsigned int x, unsigned int y)
+shared_ptr<ItemInstance> CraftingContainer::getItem(unsigned int x, unsigned int y)
{
if (x < 0 || x >= width)
{
@@ -46,31 +46,31 @@ int CraftingContainer::getName()
return 0;
}
-std::shared_ptr<ItemInstance> CraftingContainer::removeItemNoUpdate(int slot)
+shared_ptr<ItemInstance> CraftingContainer::removeItemNoUpdate(int slot)
{
if ((*items)[slot] != NULL)
{
- std::shared_ptr<ItemInstance> item = (*items)[slot];
+ shared_ptr<ItemInstance> item = (*items)[slot];
(*items)[slot] = nullptr;
return item;
}
return nullptr;
}
-std::shared_ptr<ItemInstance> CraftingContainer::removeItem(unsigned int slot, int count)
+shared_ptr<ItemInstance> CraftingContainer::removeItem(unsigned int slot, int count)
{
if ((*items)[slot] != NULL)
{
if ((*items)[slot]->count <= count)
{
- std::shared_ptr<ItemInstance> item = (*items)[slot];
+ shared_ptr<ItemInstance> item = (*items)[slot];
(*items)[slot] = nullptr;
menu->slotsChanged(); // 4J - used to take pointer to this, but wasn't using it so removed
return item;
}
else
{
- std::shared_ptr<ItemInstance> i = (*items)[slot]->remove(count);
+ shared_ptr<ItemInstance> i = (*items)[slot]->remove(count);
if ((*items)[slot]->count == 0) (*items)[slot] = nullptr;
menu->slotsChanged(); // 4J - used to take pointer to this, but wasn't using it so removed
return i;
@@ -79,7 +79,7 @@ std::shared_ptr<ItemInstance> CraftingContainer::removeItem(unsigned int slot, i
return nullptr;
}
-void CraftingContainer::setItem(unsigned int slot, std::shared_ptr<ItemInstance> item)
+void CraftingContainer::setItem(unsigned int slot, shared_ptr<ItemInstance> item)
{
(*items)[slot] = item;
if(menu) menu->slotsChanged();
@@ -94,7 +94,7 @@ void CraftingContainer::setChanged()
{
}
-bool CraftingContainer::stillValid(std::shared_ptr<Player> player)
+bool CraftingContainer::stillValid(shared_ptr<Player> player)
{
return true;
} \ No newline at end of file