summaryrefslogtreecommitdiffstats
path: root/source/DispenserEntity.h
diff options
context:
space:
mode:
Diffstat (limited to 'source/DispenserEntity.h')
-rw-r--r--source/DispenserEntity.h16
1 files changed, 6 insertions, 10 deletions
diff --git a/source/DispenserEntity.h b/source/DispenserEntity.h
index 9e69878b3..9d27c59c4 100644
--- a/source/DispenserEntity.h
+++ b/source/DispenserEntity.h
@@ -30,17 +30,13 @@ public:
virtual ~cDispenserEntity();
virtual void Destroy();
- bool LoadFromFile(cFile & a_File); // deprecated format
-
- bool LoadFromJson(const Json::Value& a_Value );
- virtual void SaveToJson(Json::Value& a_Value ) override;
-
- virtual void SendTo(cClientHandle & a_Client) override;
+ bool LoadFromJson(const Json::Value & a_Value);
- // Returns true if there's any change, forcing the chunk to go dirty.
- bool Tick( float a_Dt );
-
- virtual void UsedBy( cPlayer * a_Player ) override;
+ // cBlockEntity overrides:
+ virtual void SaveToJson(Json::Value & a_Value) override;
+ virtual void SendTo(cClientHandle & a_Client) override;
+ virtual bool Tick(float a_Dt) override;
+ virtual void UsedBy(cPlayer * a_Player) override;
const cItem * GetSlot(int i) const { return &(m_Items[i]); }