diff options
Diffstat (limited to 'Minecraft.World/HangingEntityItem.cpp')
| -rw-r--r-- | Minecraft.World/HangingEntityItem.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Minecraft.World/HangingEntityItem.cpp b/Minecraft.World/HangingEntityItem.cpp index 505dce4d..2e299b73 100644 --- a/Minecraft.World/HangingEntityItem.cpp +++ b/Minecraft.World/HangingEntityItem.cpp @@ -19,7 +19,7 @@ HangingEntityItem::HangingEntityItem(int id, eINSTANCEOF eClassType) : Item(id) // setItemCategory(CreativeModeTab.TAB_DECORATIONS); } -bool HangingEntityItem::useOn(shared_ptr<ItemInstance> instance, shared_ptr<Player> player, Level *level, int xt, int yt, int zt, int face, float clickX, float clickY, float clickZ, bool bTestOnly) +bool HangingEntityItem::useOn(std::shared_ptr<ItemInstance> instance, std::shared_ptr<Player> player, Level *level, int xt, int yt, int zt, int face, float clickX, float clickY, float clickZ, bool bTestOnly) { if (face == Facing::DOWN) return false; if (face == Facing::UP) return false; @@ -33,14 +33,14 @@ bool HangingEntityItem::useOn(shared_ptr<ItemInstance> instance, shared_ptr<Play int dir = Direction::FACING_DIRECTION[face]; - shared_ptr<HangingEntity> entity = createEntity(level, xt, yt, zt, dir); + std::shared_ptr<HangingEntity> entity = createEntity(level, xt, yt, zt, dir); //if (!player->mayUseItemAt(xt, yt, zt, face, instance)) return false; if (!player->mayBuild(xt, yt, zt)) return false; - if (entity != NULL && entity->survives()) + if (entity != NULL && entity->survives()) { - if (!level->isClientSide) + if (!level->isClientSide) { if(level->addEntity(entity)==TRUE) { @@ -65,22 +65,22 @@ bool HangingEntityItem::useOn(shared_ptr<ItemInstance> instance, shared_ptr<Play } -shared_ptr<HangingEntity> HangingEntityItem::createEntity(Level *level, int x, int y, int z, int dir) +std::shared_ptr<HangingEntity> HangingEntityItem::createEntity(Level *level, int x, int y, int z, int dir) { - if (eType == eTYPE_PAINTING) + if (eType == eTYPE_PAINTING) { - shared_ptr<Painting> painting = shared_ptr<Painting>(new Painting(level, x, y, z, dir)); + std::shared_ptr<Painting> painting = std::shared_ptr<Painting>(new Painting(level, x, y, z, dir)); painting->PaintingPostConstructor(dir); - + return dynamic_pointer_cast<HangingEntity> (painting); - } - else if (eType == eTYPE_ITEM_FRAME) + } + else if (eType == eTYPE_ITEM_FRAME) { - shared_ptr<ItemFrame> itemFrame = shared_ptr<ItemFrame>(new ItemFrame(level, x, y, z, dir)); + std::shared_ptr<ItemFrame> itemFrame = std::shared_ptr<ItemFrame>(new ItemFrame(level, x, y, z, dir)); return dynamic_pointer_cast<HangingEntity> (itemFrame); - } - else + } + else { return nullptr; } |