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:
@@ -20,18 +20,18 @@ MushroomCow::MushroomCow(Level *level) : Cow(level)
|
||||
this->setSize(0.9f, 1.3f);
|
||||
}
|
||||
|
||||
bool MushroomCow::interact(shared_ptr<Player> player)
|
||||
bool MushroomCow::interact(std::shared_ptr<Player> player)
|
||||
{
|
||||
shared_ptr<ItemInstance> item = player->inventory->getSelected();
|
||||
std::shared_ptr<ItemInstance> item = player->inventory->getSelected();
|
||||
if (item != NULL && item->id == Item::bowl_Id && getAge() >= 0)
|
||||
{
|
||||
if (item->count == 1)
|
||||
if (item->count == 1)
|
||||
{
|
||||
player->inventory->setItem(player->inventory->selected, shared_ptr<ItemInstance>( new ItemInstance(Item::mushroomStew) ) );
|
||||
player->inventory->setItem(player->inventory->selected, std::shared_ptr<ItemInstance>( new ItemInstance(Item::mushroomStew) ) );
|
||||
return true;
|
||||
}
|
||||
|
||||
if (player->inventory->add(shared_ptr<ItemInstance>(new ItemInstance(Item::mushroomStew))) && !player->abilities.instabuild)
|
||||
if (player->inventory->add(std::shared_ptr<ItemInstance>(new ItemInstance(Item::mushroomStew))) && !player->abilities.instabuild)
|
||||
{
|
||||
player->inventory->removeItem(player->inventory->selected, 1);
|
||||
return true;
|
||||
@@ -45,16 +45,16 @@ bool MushroomCow::interact(shared_ptr<Player> player)
|
||||
{
|
||||
// 4J Stu - We don't need to check spawn limits when adding the new cow, as we are removing the MushroomCow
|
||||
remove();
|
||||
shared_ptr<Cow> cow = shared_ptr<Cow>( new Cow(level) );
|
||||
std::shared_ptr<Cow> cow = std::shared_ptr<Cow>( new Cow(level) );
|
||||
cow->moveTo(x, y, z, yRot, xRot);
|
||||
cow->setHealth(getHealth());
|
||||
cow->yBodyRot = yBodyRot;
|
||||
level->addEntity(cow);
|
||||
for (int i = 0; i < 5; i++)
|
||||
{
|
||||
level->addEntity( shared_ptr<ItemEntity>( new ItemEntity(level, x, y + bbHeight, z, shared_ptr<ItemInstance>( new ItemInstance(Tile::mushroom2))) ));
|
||||
level->addEntity( std::shared_ptr<ItemEntity>( new ItemEntity(level, x, y + bbHeight, z, std::shared_ptr<ItemInstance>( new ItemInstance(Tile::mushroom2))) ));
|
||||
}
|
||||
return true;
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@@ -70,12 +70,12 @@ bool MushroomCow::canSpawn()
|
||||
return ( level->getTile(xt, yt - 1, zt) == Tile::grass_Id || level->getTile(xt, yt - 1, zt) == Tile::mycel_Id ) && level->getDaytimeRawBrightness(xt, yt, zt) > 8 && PathfinderMob::canSpawn();
|
||||
}
|
||||
|
||||
shared_ptr<AgableMob> MushroomCow::getBreedOffspring(shared_ptr<AgableMob> target)
|
||||
std::shared_ptr<AgableMob> MushroomCow::getBreedOffspring(std::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<MushroomCow>( new MushroomCow(level) );
|
||||
return std::shared_ptr<MushroomCow>( new MushroomCow(level) );
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user