aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/MushroomCow.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-07 21:56:03 -0500
committerGitHub <noreply@github.com>2026-03-08 09:56:03 +0700
commita9be52c41a02d207233199e98898fe7483d7e817 (patch)
tree71dfaec3a86b05e9ca409b97d8eb9d7f993bfdd0 /Minecraft.World/MushroomCow.cpp
parent1be5faaea781402e7de06b263eeca4c688b7712c (diff)
Project modernization (#630)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
Diffstat (limited to 'Minecraft.World/MushroomCow.cpp')
-rw-r--r--Minecraft.World/MushroomCow.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/Minecraft.World/MushroomCow.cpp b/Minecraft.World/MushroomCow.cpp
index 0f88c843..2b274215 100644
--- a/Minecraft.World/MushroomCow.cpp
+++ b/Minecraft.World/MushroomCow.cpp
@@ -24,36 +24,36 @@ MushroomCow::MushroomCow(Level *level) : Cow(level)
bool MushroomCow::mobInteract(shared_ptr<Player> player)
{
shared_ptr<ItemInstance> item = player->inventory->getSelected();
- if (item != NULL && item->id == Item::bowl_Id && getAge() >= 0)
+ if (item != nullptr && item->id == Item::bowl_Id && getAge() >= 0)
{
if (item->count == 1)
{
- player->inventory->setItem(player->inventory->selected, shared_ptr<ItemInstance>( new ItemInstance(Item::mushroomStew) ) );
+ player->inventory->setItem(player->inventory->selected, std::make_shared<ItemInstance>(Item::mushroomStew));
return true;
}
- if (player->inventory->add(shared_ptr<ItemInstance>(new ItemInstance(Item::mushroomStew))) && !player->abilities.instabuild)
+ if (player->inventory->add(std::make_shared<ItemInstance>(Item::mushroomStew)) && !player->abilities.instabuild)
{
player->inventory->removeItem(player->inventory->selected, 1);
return true;
}
}
// 4J: Do not allow shearing if we can't create more cows
- if (item != NULL && item->id == Item::shears_Id && getAge() >= 0 && level->canCreateMore(eTYPE_COW, Level::eSpawnType_Breed))
+ if (item != nullptr && item->id == Item::shears_Id && getAge() >= 0 && level->canCreateMore(eTYPE_COW, Level::eSpawnType_Breed))
{
remove();
level->addParticle(eParticleType_largeexplode, x, y + bbHeight / 2, z, 0, 0, 0);
if(!level->isClientSide)
{
remove();
- shared_ptr<Cow> cow = shared_ptr<Cow>( new Cow(level) );
+ shared_ptr<Cow> cow = std::make_shared<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::mushroom_red))) ));
+ level->addEntity(std::make_shared<ItemEntity>(level, x, y + bbHeight, z, shared_ptr<ItemInstance>(new ItemInstance(Tile::mushroom_red))));
}
return true;
}
@@ -76,7 +76,7 @@ shared_ptr<AgableMob> MushroomCow::getBreedOffspring(shared_ptr<AgableMob> targe
// 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::make_shared<MushroomCow>(level);
}
else
{