From 578560d2132188279e4b0930212edd915bc90008 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Mon, 1 Apr 2013 20:56:25 +0000 Subject: Proper fix for FS #347. Also unification of ticking block entities. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1348 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/DispenserEntity.h | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'source/DispenserEntity.h') 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]); } -- cgit v1.2.3