summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities/DispenserEntity.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2017-06-15 15:32:33 +0200
committerLukas Pioch <lukas@zgow.de>2017-06-16 14:11:28 +0200
commit0dd1cd750bb51403d85a226a97a5ad93eb99b144 (patch)
tree8c7a4e8580a780e1ed27f4141c32de7ec3087710 /src/BlockEntities/DispenserEntity.h
parentChoose # of threads based on system info (#3644) (diff)
downloadcuberite-0dd1cd750bb51403d85a226a97a5ad93eb99b144.tar
cuberite-0dd1cd750bb51403d85a226a97a5ad93eb99b144.tar.gz
cuberite-0dd1cd750bb51403d85a226a97a5ad93eb99b144.tar.bz2
cuberite-0dd1cd750bb51403d85a226a97a5ad93eb99b144.tar.lz
cuberite-0dd1cd750bb51403d85a226a97a5ad93eb99b144.tar.xz
cuberite-0dd1cd750bb51403d85a226a97a5ad93eb99b144.tar.zst
cuberite-0dd1cd750bb51403d85a226a97a5ad93eb99b144.zip
Diffstat (limited to '')
-rw-r--r--src/BlockEntities/DispenserEntity.h6
1 files changed, 3 insertions, 3 deletions
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. */