aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/StoneSlabTile.cpp
diff options
context:
space:
mode:
authorvoid_17 <heroerror3@gmail.com>2026-03-02 17:37:16 +0700
committervoid_17 <heroerror3@gmail.com>2026-03-02 17:37:16 +0700
commit119bff351450ea16ffda550b6e0f67379b29f708 (patch)
treed9f28714afd516bc2450f33b0a77c5e05ff4de90 /Minecraft.World/StoneSlabTile.cpp
parent8a2a62ea1d47364f802cf9aae97668bc4a7007b5 (diff)
Revert "shared_ptr -> std::shared_ptr"
This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5.
Diffstat (limited to 'Minecraft.World/StoneSlabTile.cpp')
-rw-r--r--Minecraft.World/StoneSlabTile.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Minecraft.World/StoneSlabTile.cpp b/Minecraft.World/StoneSlabTile.cpp
index 1a51ef11..5c8d8b07 100644
--- a/Minecraft.World/StoneSlabTile.cpp
+++ b/Minecraft.World/StoneSlabTile.cpp
@@ -32,7 +32,7 @@ Icon *StoneSlabTile::getTexture(int face, int data)
case STONE_SLAB:
if (face == Facing::UP || face == Facing::DOWN) return icon;
return iconSide;
- break;
+ break;
case SAND_SLAB:
return Tile::sandStone->getTexture(face);
case WOOD_SLAB:
@@ -48,7 +48,7 @@ Icon *StoneSlabTile::getTexture(int face, int data)
case QUARTZ_SLAB:
return Tile::quartzBlock->getTexture(face);
}
-
+
return icon;
}
@@ -69,16 +69,16 @@ unsigned int StoneSlabTile::getDescriptionId(int iData /*= -1*/)
return StoneSlabTile::SLAB_NAMES[iData];
}
-int StoneSlabTile::getAuxName(int auxValue)
+int StoneSlabTile::getAuxName(int auxValue)
{
- if (auxValue < 0 || auxValue >= SLAB_NAMES_LENGTH)
+ if (auxValue < 0 || auxValue >= SLAB_NAMES_LENGTH)
{
auxValue = 0;
}
return SLAB_NAMES[auxValue];//super.getDescriptionId() + "." + SLAB_NAMES[auxValue];
}
-std::shared_ptr<ItemInstance> StoneSlabTile::getSilkTouchItemInstance(int data)
+shared_ptr<ItemInstance> StoneSlabTile::getSilkTouchItemInstance(int data)
{
- return std::shared_ptr<ItemInstance>(new ItemInstance(Tile::stoneSlabHalf_Id, 2, data & TYPE_MASK));
+ return shared_ptr<ItemInstance>(new ItemInstance(Tile::stoneSlabHalf_Id, 2, data & TYPE_MASK));
}