shared_ptr -> std::shared_ptr
This is one of the first commits in a plan to remove all `using namespace std;` lines in the entire codebase as it is considered anti-pattern today.
This commit is contained in:
@@ -8,7 +8,7 @@ MilkBucketItem::MilkBucketItem(int id) : Item( id )
|
||||
setMaxStackSize(1);
|
||||
}
|
||||
|
||||
shared_ptr<ItemInstance> MilkBucketItem::useTimeDepleted(shared_ptr<ItemInstance> instance, Level *level, shared_ptr<Player> player)
|
||||
std::shared_ptr<ItemInstance> MilkBucketItem::useTimeDepleted(std::shared_ptr<ItemInstance> instance, Level *level, std::shared_ptr<Player> player)
|
||||
{
|
||||
if (!player->abilities.instabuild) instance->count--;
|
||||
|
||||
@@ -19,22 +19,22 @@ shared_ptr<ItemInstance> MilkBucketItem::useTimeDepleted(shared_ptr<ItemInstance
|
||||
|
||||
if (instance->count <= 0)
|
||||
{
|
||||
return shared_ptr<ItemInstance>( new ItemInstance(Item::bucket_empty) );
|
||||
return std::shared_ptr<ItemInstance>( new ItemInstance(Item::bucket_empty) );
|
||||
}
|
||||
return instance;
|
||||
}
|
||||
|
||||
int MilkBucketItem::getUseDuration(shared_ptr<ItemInstance> itemInstance)
|
||||
int MilkBucketItem::getUseDuration(std::shared_ptr<ItemInstance> itemInstance)
|
||||
{
|
||||
return DRINK_DURATION;
|
||||
}
|
||||
|
||||
UseAnim MilkBucketItem::getUseAnimation(shared_ptr<ItemInstance> itemInstance)
|
||||
UseAnim MilkBucketItem::getUseAnimation(std::shared_ptr<ItemInstance> itemInstance)
|
||||
{
|
||||
return UseAnim_drink;
|
||||
}
|
||||
|
||||
shared_ptr<ItemInstance> MilkBucketItem::use(shared_ptr<ItemInstance> instance, Level *level, shared_ptr<Player> player)
|
||||
std::shared_ptr<ItemInstance> MilkBucketItem::use(std::shared_ptr<ItemInstance> instance, Level *level, std::shared_ptr<Player> player)
|
||||
{
|
||||
player->startUsingItem(instance, getUseDuration(instance));
|
||||
return instance;
|
||||
|
||||
Reference in New Issue
Block a user