From 0dd1cd750bb51403d85a226a97a5ad93eb99b144 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Thu, 15 Jun 2017 15:32:33 +0200 Subject: BlockEntities: Support cloning self. --- src/BlockEntities/DispenserEntity.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/BlockEntities/DispenserEntity.h') diff --git a/src/BlockEntities/DispenserEntity.h b/src/BlockEntities/DispenserEntity.h index 4e81b455a..bb4178079 100644 --- a/src/BlockEntities/DispenserEntity.h +++ b/src/BlockEntities/DispenserEntity.h @@ -11,7 +11,7 @@ class cDispenserEntity : public cDropSpenserEntity { - typedef cDropSpenserEntity super; + typedef cDropSpenserEntity Super; public: @@ -20,7 +20,7 @@ public: BLOCKENTITY_PROTODEF(cDispenserEntity) /** Constructor used for normal operation */ - cDispenserEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World); + cDispenserEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World); // tolua_begin @@ -38,7 +38,7 @@ private: virtual void DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum) override; /** If such a bucket can fit, adds it to m_Contents and returns true */ - bool ScoopUpLiquid(int a_SlotNum, short a_BucketItemType); + bool ScoopUpLiquid(int a_SlotNum, short a_ResultingBucketItemType); /** If the a_BlockInFront can be washed away by liquid and the empty bucket can fit, does the m_Contents processing and returns true. Returns false otherwise. */ -- cgit v1.2.3