diff options
Diffstat (limited to 'Minecraft.World/BottleItem.cpp')
| -rw-r--r-- | Minecraft.World/BottleItem.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.World/BottleItem.cpp b/Minecraft.World/BottleItem.cpp index 3aecafee..804384f7 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); } -shared_ptr<ItemInstance> BottleItem::use(shared_ptr<ItemInstance> itemInstance, Level *level, shared_ptr<Player> player) +std::shared_ptr<ItemInstance> BottleItem::use(std::shared_ptr<ItemInstance> itemInstance, Level *level, std::shared_ptr<Player> player) { HitResult *hr = getPlayerPOVHitResult(level, player, true); if (hr == NULL) return itemInstance; @@ -40,13 +40,13 @@ shared_ptr<ItemInstance> BottleItem::use(shared_ptr<ItemInstance> itemInstance, itemInstance->count--; if (itemInstance->count <= 0) { - return shared_ptr<ItemInstance>( new ItemInstance( (Item *)Item::potion) ); + return std::shared_ptr<ItemInstance>( new ItemInstance( (Item *)Item::potion) ); } else { - if (!player->inventory->add(shared_ptr<ItemInstance>( new ItemInstance( (Item *)Item::potion) ))) + if (!player->inventory->add(std::shared_ptr<ItemInstance>( new ItemInstance( (Item *)Item::potion) ))) { - player->drop( shared_ptr<ItemInstance>( new ItemInstance(Item::potion_Id, 1, 0) )); + player->drop( std::shared_ptr<ItemInstance>( new ItemInstance(Item::potion_Id, 1, 0) )); } } } @@ -60,7 +60,7 @@ shared_ptr<ItemInstance> BottleItem::use(shared_ptr<ItemInstance> itemInstance, } // 4J-PB - added to allow tooltips -bool BottleItem::TestUse(Level *level, shared_ptr<Player> player) +bool BottleItem::TestUse(Level *level, std::shared_ptr<Player> player) { HitResult *hr = getPlayerPOVHitResult(level, player, true); if (hr == NULL) return false; |