diff options
Diffstat (limited to 'Minecraft.World/Cow.cpp')
| -rw-r--r-- | Minecraft.World/Cow.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.World/Cow.cpp b/Minecraft.World/Cow.cpp index 05e70102..69628d64 100644 --- a/Minecraft.World/Cow.cpp +++ b/Minecraft.World/Cow.cpp @@ -106,17 +106,17 @@ void Cow::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) bool Cow::mobInteract(shared_ptr<Player> player) { shared_ptr<ItemInstance> item = player->inventory->getSelected(); - if (item != NULL && item->id == Item::bucket_empty->id && !player->abilities.instabuild) + if (item != nullptr && item->id == Item::bucket_empty->id && !player->abilities.instabuild) { player->awardStat(GenericStats::cowsMilked(),GenericStats::param_cowsMilked()); if (item->count-- == 0) { - player->inventory->setItem(player->inventory->selected, shared_ptr<ItemInstance>( new ItemInstance(Item::bucket_milk) ) ); + player->inventory->setItem(player->inventory->selected, std::make_shared<ItemInstance>(Item::bucket_milk)); } - else if (!player->inventory->add(shared_ptr<ItemInstance>( new ItemInstance(Item::bucket_milk) ))) + else if (!player->inventory->add(std::make_shared<ItemInstance>(Item::bucket_milk))) { - player->drop(shared_ptr<ItemInstance>( new ItemInstance(Item::bucket_milk) )); + player->drop(std::make_shared<ItemInstance>(Item::bucket_milk)); } return true; @@ -129,7 +129,7 @@ shared_ptr<AgableMob> Cow::getBreedOffspring(shared_ptr<AgableMob> target) // 4J - added limit to number of animals that can be bred if( level->canCreateMore( GetType(), Level::eSpawnType_Breed) ) { - return shared_ptr<Cow>( new Cow(level) ); + return std::make_shared<Cow>(level); } else { |