LegacyConsoleArchive/4jcraft
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-09-28 02:10:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: unglob std::shared_ptr

Browse Source
This commit is contained in:
Tropical
2026-03-06 11:20:45 -06:00
parent 0dd1654dec
commit 67ceccf2d4
1065 changed files with 5754 additions and 5749 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.World/Items/TileItems/SkullItem.cpp
+6 -6
View File
@@ -18,7 +18,7 @@ SkullItem::SkullItem(int id) : Item(id)
setStackedByData(true);
}
bool SkullItem::useOn(shared_ptr<ItemInstance> instance, shared_ptr<Player> player, Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly) //float clickX, float clickY, float clickZ)
bool SkullItem::useOn(std::shared_ptr<ItemInstance> instance, std::shared_ptr<Player> player, Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly) //float clickX, float clickY, float clickZ)
{
if (face == 0) return false;
if (!level->getMaterial(x, y, z)->isSolid()) return false;
@@ -45,8 +45,8 @@ bool SkullItem::useOn(shared_ptr<ItemInstance> instance, shared_ptr<Player> play
rot = Mth::floor(((player->yRot) * 16) / 360 + 0.5) & 15;
}
shared_ptr<TileEntity> skullTE = level->getTileEntity(x, y, z);
shared_ptr<SkullTileEntity> skull = dynamic_pointer_cast<SkullTileEntity>(skullTE);
std::shared_ptr<TileEntity> skullTE = level->getTileEntity(x, y, z);
std::shared_ptr<SkullTileEntity> skull = dynamic_pointer_cast<SkullTileEntity>(skullTE);
if (skull != NULL)
{
@@ -65,7 +65,7 @@ bool SkullItem::useOn(shared_ptr<ItemInstance> instance, shared_ptr<Player> play
return true;
}
bool SkullItem::mayPlace(Level *level, int x, int y, int z, int face, shared_ptr<Player> player, shared_ptr<ItemInstance> item)
bool SkullItem::mayPlace(Level *level, int x, int y, int z, int face, std::shared_ptr<Player> player, std::shared_ptr<ItemInstance> item)
{
int currentTile = level->getTile(x, y, z);
if (currentTile == Tile::topSnow_Id)
@@ -108,7 +108,7 @@ unsigned int SkullItem::getDescriptionId(int iData)
return NAMES[iData];
}
unsigned int SkullItem::getDescriptionId(shared_ptr<ItemInstance> instance)
unsigned int SkullItem::getDescriptionId(std::shared_ptr<ItemInstance> instance)
{
int auxValue = instance->getAuxValue();
if (auxValue < 0 || auxValue >= SKULL_COUNT)
@@ -118,7 +118,7 @@ unsigned int SkullItem::getDescriptionId(shared_ptr<ItemInstance> instance)
return NAMES[auxValue];
}
wstring SkullItem::getHoverName(shared_ptr<ItemInstance> itemInstance)
wstring SkullItem::getHoverName(std::shared_ptr<ItemInstance> itemInstance)
{
#if 0
if (itemInstance->getAuxValue() == SkullTileEntity::TYPE_CHAR && itemInstance->hasTag() && itemInstance->getTag()->contains(L"SkullOwner"))