From 119bff351450ea16ffda550b6e0f67379b29f708 Mon Sep 17 00:00:00 2001 From: void_17 Date: Mon, 2 Mar 2026 17:37:16 +0700 Subject: Revert "shared_ptr -> std::shared_ptr" This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5. --- Minecraft.World/SkullTile.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'Minecraft.World/SkullTile.cpp') diff --git a/Minecraft.World/SkullTile.cpp b/Minecraft.World/SkullTile.cpp index 38c47479..73aef0e1 100644 --- a/Minecraft.World/SkullTile.cpp +++ b/Minecraft.World/SkullTile.cpp @@ -25,7 +25,7 @@ bool SkullTile::isCubeShaped() return false; } -void SkullTile::updateShape(LevelSource *level, int x, int y, int z, int forceData , std::shared_ptr forceEntity) +void SkullTile::updateShape(LevelSource *level, int x, int y, int z, int forceData , shared_ptr forceEntity) { int data = level->getData(x, y, z) & PLACEMENT_MASK; @@ -56,15 +56,15 @@ AABB *SkullTile::getAABB(Level *level, int x, int y, int z) return EntityTile::getAABB(level, x, y, z); } -void SkullTile::setPlacedBy(Level *level, int x, int y, int z, std::shared_ptr by) +void SkullTile::setPlacedBy(Level *level, int x, int y, int z, shared_ptr by) { int dir = Mth::floor(by->yRot * 4 / (360) + 2.5) & 3; level->setData(x, y, z, dir); } -std::shared_ptr SkullTile::newTileEntity(Level *level) +shared_ptr SkullTile::newTileEntity(Level *level) { - return std::shared_ptr(new SkullTileEntity()); + return shared_ptr(new SkullTileEntity()); } int SkullTile::cloneTileId(Level *level, int x, int y, int z) @@ -74,8 +74,8 @@ int SkullTile::cloneTileId(Level *level, int x, int y, int z) int SkullTile::cloneTileData(Level *level, int x, int y, int z) { - std::shared_ptr tileEntity = level->getTileEntity(x, y, z); - std::shared_ptr skull = dynamic_pointer_cast(tileEntity); + shared_ptr tileEntity = level->getTileEntity(x, y, z); + shared_ptr skull = dynamic_pointer_cast(tileEntity); if (skull != NULL) { return skull->getSkullType(); @@ -96,7 +96,7 @@ void SkullTile::spawnResources(Level *level, int x, int y, int z, int data, floa // ... because the tile entity is removed prior to spawnResources } -void SkullTile::playerWillDestroy(Level *level, int x, int y, int z, int data, std::shared_ptr player) +void SkullTile::playerWillDestroy(Level *level, int x, int y, int z, int data, shared_ptr player) { // 4J Stu - Not implemented #if 0 @@ -116,8 +116,8 @@ void SkullTile::onRemove(Level *level, int x, int y, int z)//, int id, int data) int data = level->getData(x, y, z); if ((data & NO_DROP_BIT) == 0) { - std::shared_ptr item = std::shared_ptr(new ItemInstance(Item::skull_Id, 1, cloneTileData(level, x, y, z))); - std::shared_ptr entity = dynamic_pointer_cast(level->getTileEntity(x, y, z)); + shared_ptr item = shared_ptr(new ItemInstance(Item::skull_Id, 1, cloneTileData(level, x, y, z))); + shared_ptr entity = dynamic_pointer_cast(level->getTileEntity(x, y, z)); if (entity->getSkullType() == SkullTileEntity::TYPE_CHAR && !entity->getExtraType().empty()) { @@ -135,7 +135,7 @@ int SkullTile::getResource(int data, Random *random, int playerBonusLevel) return Item::skull_Id; } -void SkullTile::checkMobSpawn(Level *level, int x, int y, int z, std::shared_ptr placedSkull) +void SkullTile::checkMobSpawn(Level *level, int x, int y, int z, shared_ptr placedSkull) { // 4J Stu - Don't have Withers yet, so don't need this #if 0 @@ -244,8 +244,8 @@ bool SkullTile::isSkullAt(Level *level, int x, int y, int z, int skullType) { return false; } - std::shared_ptr te = level->getTileEntity(x, y, z); - std::shared_ptr skull = dynamic_pointer_cast(te); + shared_ptr te = level->getTileEntity(x, y, z); + shared_ptr skull = dynamic_pointer_cast(te); if (skull == NULL) { return false; -- cgit v1.2.3