summaryrefslogtreecommitdiffstats
path: root/source/blocks/Block.h
diff options
context:
space:
mode:
authorlapayo94@gmail.com <lapayo94@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-07-16 21:20:37 +0200
committerlapayo94@gmail.com <lapayo94@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-07-16 21:20:37 +0200
commit86a991c5a85a9771143320de91d87f6e986300a9 (patch)
treedee2b3b326103217b982a49c90a489eb35235392 /source/blocks/Block.h
parentFixed a copypasta error in previous commit (diff)
downloadcuberite-86a991c5a85a9771143320de91d87f6e986300a9.tar
cuberite-86a991c5a85a9771143320de91d87f6e986300a9.tar.gz
cuberite-86a991c5a85a9771143320de91d87f6e986300a9.tar.bz2
cuberite-86a991c5a85a9771143320de91d87f6e986300a9.tar.lz
cuberite-86a991c5a85a9771143320de91d87f6e986300a9.tar.xz
cuberite-86a991c5a85a9771143320de91d87f6e986300a9.tar.zst
cuberite-86a991c5a85a9771143320de91d87f6e986300a9.zip
Diffstat (limited to 'source/blocks/Block.h')
-rw-r--r--source/blocks/Block.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blocks/Block.h b/source/blocks/Block.h
index f55ee7dd2..e35856459 100644
--- a/source/blocks/Block.h
+++ b/source/blocks/Block.h
@@ -19,18 +19,17 @@ public:
virtual void OnNeighborChanged(cWorld *a_World, int a_X, int a_Y, int a_Z);
static void NeighborChanged(cWorld *a_World, int a_X, int a_Y, int a_Z);
virtual void OnClick(cWorld *a_World, cPlayer *a_Player, int a_X, int a_Y, int a_Z);
- virtual void PlaceBlock(cWorld *a_World, cPlayer *a_Player, char a_BlockMeta, int a_X, int a_Y, int a_Z, char a_Dir);
+ virtual void PlaceBlock(cWorld *a_World, cPlayer *a_Player, NIBBLETYPE a_BlockMeta, int a_X, int a_Y, int a_Z, char a_Dir);
virtual int GetTickRate();
virtual char GetDropCount();
virtual int GetDropID();
- virtual char GetDropMeta(char a_BlockMeta);
+ virtual NIBBLETYPE GetDropMeta(NIBBLETYPE a_BlockMeta);
virtual bool NeedsRandomTicks();
- //Item is -2 if it wasn´t a player
virtual void DropBlock(cWorld *a_World, int a_X, int a_Y, int a_Z);
//Checks if the block can stay at
virtual bool CanBeAt(cWorld *a_World, int a_X, int a_Y, int a_Z);
- //Checks if the block can be placed at Default:CanBeAt(...) NOTE: In the block is not placed
+ //Checks if the block can be placed at this point. Default: CanBeAt(...) NOTE: In the block is not placed in this callback
virtual bool CanBePlacedAt(cWorld *a_World, int a_X, int a_Y, int a_Z, char a_Dir);
//This gets called if the player tries to place a block ontop of this block (Only if he aims directly on this block)
virtual bool AllowBlockOnTop();
@@ -42,7 +41,7 @@ public:
//Does this block drops if it gets destroyed by an unsuitable situation? Default: true
virtual bool DropOnUnsuitable();
- static cBlockHandler *GetBlockHandler(char a_BlockID);
+ static cBlockHandler *GetBlockHandler(BLOCKTYPE a_BlockID);
static void Deinit();
@@ -54,4 +53,4 @@ protected:
};
-inline cBlockHandler *BlockHandler(char a_BlockID) { return cBlockHandler::GetBlockHandler(a_BlockID); } \ No newline at end of file
+inline cBlockHandler *BlockHandler(BLOCKTYPE a_BlockID) { return cBlockHandler::GetBlockHandler(a_BlockID); } \ No newline at end of file