aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/PumpkinTile.cpp
diff options
context:
space:
mode:
authorLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
committerLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
commit087b7e7abfe81dd7f0fdcdea36ac9f245950df1a (patch)
tree69454763e73ca764af4e682d3573080b13138a0e /Minecraft.World/PumpkinTile.cpp
parenta9be52c41a02d207233199e98898fe7483d7e817 (diff)
Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore functionality of the nightly. All in-game menus do not work and generating a world crashes. This reverts commit a9be52c41a02d207233199e98898fe7483d7e817.
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 da11001d..2bc36972 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 = nullptr;
- iconFace = nullptr;
+ iconTop = NULL;
+ iconFace = NULL;
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 = std::make_shared<SnowMan>(level);
+ shared_ptr<SnowMan> snowMan = shared_ptr<SnowMan>(new 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 = std::make_shared<VillagerGolem>(level);
+ shared_ptr<VillagerGolem> villagerGolem = shared_ptr<VillagerGolem>(new VillagerGolem(level));
villagerGolem->setPlayerCreated(true);
villagerGolem->moveTo(x + 0.5, y - 1.95, z + 0.5, 0, 0);
level->addEntity(villagerGolem);