diff options
Diffstat (limited to 'Minecraft.World/ItemEntity.h')
| -rw-r--r-- | Minecraft.World/ItemEntity.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Minecraft.World/ItemEntity.h b/Minecraft.World/ItemEntity.h index 1f42bc21..456a7441 100644 --- a/Minecraft.World/ItemEntity.h +++ b/Minecraft.World/ItemEntity.h @@ -30,9 +30,9 @@ private: public: float bobOffs; - + ItemEntity(Level *level, double x, double y, double z); - ItemEntity(Level *level, double x, double y, double z, shared_ptr<ItemInstance> item); + ItemEntity(Level *level, double x, double y, double z, std::shared_ptr<ItemInstance> item); protected: virtual bool makeStepSound(); @@ -50,7 +50,7 @@ private: void mergeWithNeighbours(); public: - bool merge(shared_ptr<ItemEntity> target); + bool merge(std::shared_ptr<ItemEntity> target); void setShortLifeTime(); virtual bool updateInWaterState(); @@ -61,12 +61,12 @@ public: virtual bool hurt(DamageSource *source, int damage); virtual void addAdditonalSaveData(CompoundTag *entityTag); virtual void readAdditionalSaveData(CompoundTag *tag); - virtual void playerTouch(shared_ptr<Player> player); + virtual void playerTouch(std::shared_ptr<Player> player); virtual wstring getAName(); - shared_ptr<ItemInstance> getItem(); - void setItem(shared_ptr<ItemInstance> item); + std::shared_ptr<ItemInstance> getItem(); + void setItem(std::shared_ptr<ItemInstance> item); virtual bool isAttackable(); void setThrower(const wstring &thrower); |