From 119bff351450ea16ffda550b6e0f67379b29f708 Mon Sep 17 00:00:00 2001 From: void_17 Date: Mon, 2 Mar 2026 17:37:16 +0700 Subject: Revert "shared_ptr -> std::shared_ptr" This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5. --- Minecraft.World/BottleItem.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Minecraft.World/BottleItem.cpp') diff --git a/Minecraft.World/BottleItem.cpp b/Minecraft.World/BottleItem.cpp index 804384f7..3aecafee 100644 --- a/Minecraft.World/BottleItem.cpp +++ b/Minecraft.World/BottleItem.cpp @@ -15,7 +15,7 @@ Icon *BottleItem::getIcon(int auxValue) return Item::potion->getIcon(0); } -std::shared_ptr BottleItem::use(std::shared_ptr itemInstance, Level *level, std::shared_ptr player) +shared_ptr BottleItem::use(shared_ptr itemInstance, Level *level, shared_ptr player) { HitResult *hr = getPlayerPOVHitResult(level, player, true); if (hr == NULL) return itemInstance; @@ -40,13 +40,13 @@ std::shared_ptr BottleItem::use(std::shared_ptr item itemInstance->count--; if (itemInstance->count <= 0) { - return std::shared_ptr( new ItemInstance( (Item *)Item::potion) ); + return shared_ptr( new ItemInstance( (Item *)Item::potion) ); } else { - if (!player->inventory->add(std::shared_ptr( new ItemInstance( (Item *)Item::potion) ))) + if (!player->inventory->add(shared_ptr( new ItemInstance( (Item *)Item::potion) ))) { - player->drop( std::shared_ptr( new ItemInstance(Item::potion_Id, 1, 0) )); + player->drop( shared_ptr( new ItemInstance(Item::potion_Id, 1, 0) )); } } } @@ -60,7 +60,7 @@ std::shared_ptr BottleItem::use(std::shared_ptr item } // 4J-PB - added to allow tooltips -bool BottleItem::TestUse(Level *level, std::shared_ptr player) +bool BottleItem::TestUse(Level *level, shared_ptr player) { HitResult *hr = getPlayerPOVHitResult(level, player, true); if (hr == NULL) return false; -- cgit v1.2.3