diff options
Diffstat (limited to 'Minecraft.World/ButtonTile.h')
| -rw-r--r-- | Minecraft.World/ButtonTile.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.World/ButtonTile.h b/Minecraft.World/ButtonTile.h index e06158e0..0721c05c 100644 --- a/Minecraft.World/ButtonTile.h +++ b/Minecraft.World/ButtonTile.h @@ -37,22 +37,22 @@ private: bool checkCanSurvive(Level *level, int x, int y, int z); public: - virtual void updateShape(LevelSource *level, int x, int y, int z, int forceData = -1, shared_ptr<TileEntity> forceEntity = shared_ptr<TileEntity>()); // 4J added forceData, forceEntity param + virtual void updateShape(LevelSource *level, int x, int y, int z, int forceData = -1, std::shared_ptr<TileEntity> forceEntity = std::shared_ptr<TileEntity>()); // 4J added forceData, forceEntity param private: void updateShape(int data); public: - virtual void attack(Level *level, int x, int y, int z, shared_ptr<Player> player); + virtual void attack(Level *level, int x, int y, int z, std::shared_ptr<Player> player); virtual bool TestUse(); - virtual bool use(Level *level, int x, int y, int z, shared_ptr<Player> player, int clickedFace, float clickX, float clickY, float clickZ, bool soundOnly = false); // 4J added soundOnly param + virtual bool use(Level *level, int x, int y, int z, std::shared_ptr<Player> player, int clickedFace, float clickX, float clickY, float clickZ, bool soundOnly = false); // 4J added soundOnly param virtual void onRemove(Level *level, int x, int y, int z, int id, int data); virtual bool getSignal(LevelSource *level, int x, int y, int z, int dir); virtual bool getDirectSignal(Level *level, int x, int y, int z, int dir); virtual bool isSignalSource(); virtual void tick(Level *level, int x, int y, int z, Random *random); virtual void updateDefaultShape(); - void entityInside(Level *level, int x, int y, int z, shared_ptr<Entity> entity); + void entityInside(Level *level, int x, int y, int z, std::shared_ptr<Entity> entity); private: void checkPressed(Level *level, int x, int y, int z); @@ -60,7 +60,7 @@ private: public: void registerIcons(IconRegister *iconRegister); - + // 4J Added so we can check before we try to add a tile to the tick list if it's actually going to do seomthing virtual bool shouldTileTick(Level *level, int x,int y,int z); };
\ No newline at end of file |