aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/PumpkinTile.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/PumpkinTile.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/PumpkinTile.cpp')
-rw-r--r--Minecraft.World/PumpkinTile.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Minecraft.World/PumpkinTile.cpp b/Minecraft.World/PumpkinTile.cpp
index 2bc36972..da11001d 100644
--- a/Minecraft.World/PumpkinTile.cpp
+++ b/Minecraft.World/PumpkinTile.cpp
@@ -13,8 +13,8 @@ const wstring PumpkinTile::TEXTURE_LANTERN = L"pumpkin_jack";
PumpkinTile::PumpkinTile(int id, bool lit) : DirectionalTile(id, Material::vegetable, isSolidRender() )
{
- iconTop = NULL;
- iconFace = NULL;
+ iconTop = nullptr;
+ iconFace = nullptr;
setTicking(true);
this->lit = lit;
}
@@ -45,7 +45,7 @@ void PumpkinTile::onPlace(Level *level, int x, int y, int z)
level->setTileAndData(x, y, z, 0, 0, Tile::UPDATE_CLIENTS);
level->setTileAndData(x, y - 1, z, 0, 0, Tile::UPDATE_CLIENTS);
level->setTileAndData(x, y - 2, z, 0, 0, Tile::UPDATE_CLIENTS);
- shared_ptr<SnowMan> snowMan = shared_ptr<SnowMan>(new SnowMan(level));
+ shared_ptr<SnowMan> snowMan = std::make_shared<SnowMan>(level);
snowMan->moveTo(x + 0.5, y - 1.95, z + 0.5, 0, 0);
level->addEntity(snowMan);
@@ -94,7 +94,7 @@ void PumpkinTile::onPlace(Level *level, int x, int y, int z)
level->setTileAndData(x, y - 1, z + 1, 0, 0, Tile::UPDATE_CLIENTS);
}
- shared_ptr<VillagerGolem> villagerGolem = shared_ptr<VillagerGolem>(new VillagerGolem(level));
+ shared_ptr<VillagerGolem> villagerGolem = std::make_shared<VillagerGolem>(level);
villagerGolem->setPlayerCreated(true);
villagerGolem->moveTo(x + 0.5, y - 1.95, z + 0.5, 0, 0);
level->addEntity(villagerGolem);