summaryrefslogtreecommitdiffstats
path: root/source/FallingBlock.h
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-03-02 20:57:09 +0100
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-03-02 20:57:09 +0100
commit6744738a85c60238585dcf72af211f852fd7e4c6 (patch)
tree47f36786b377a69097dc479ea9ab8991b35eb9d5 /source/FallingBlock.h
parentAdded the anvil block (diff)
downloadcuberite-6744738a85c60238585dcf72af211f852fd7e4c6.tar
cuberite-6744738a85c60238585dcf72af211f852fd7e4c6.tar.gz
cuberite-6744738a85c60238585dcf72af211f852fd7e4c6.tar.bz2
cuberite-6744738a85c60238585dcf72af211f852fd7e4c6.tar.lz
cuberite-6744738a85c60238585dcf72af211f852fd7e4c6.tar.xz
cuberite-6744738a85c60238585dcf72af211f852fd7e4c6.tar.zst
cuberite-6744738a85c60238585dcf72af211f852fd7e4c6.zip
Diffstat (limited to '')
-rw-r--r--source/FallingBlock.h15
1 files changed, 6 insertions, 9 deletions
diff --git a/source/FallingBlock.h b/source/FallingBlock.h
index abc3f8d9b..37fb4c4cc 100644
--- a/source/FallingBlock.h
+++ b/source/FallingBlock.h
@@ -23,9 +23,10 @@ class cFallingBlock :
public:
CLASS_PROTODEF(cFallingBlock);
- cFallingBlock(const Vector3i & a_BlockPosition, BLOCKTYPE a_BlockType);
+ cFallingBlock(const Vector3i & a_BlockPosition, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta);
- BLOCKTYPE GetBlockType(void) const { return m_BlockType; }
+ BLOCKTYPE GetBlockType(void) const { return m_BlockType; }
+ NIBBLETYPE GetBlockMeta(void) const { return m_BlockMeta; }
// cEntity overrides:
virtual void Initialize(cWorld * a_World) override;
@@ -33,13 +34,9 @@ public:
virtual void Tick(float a_Dt, MTRand & a_TickRandom) override;
private:
- BLOCKTYPE m_BlockType;
- Vector3i m_OriginalPosition;
-
- static bool IsPassable(BLOCKTYPE a_BlockType)
- {
- return ((a_BlockType == E_BLOCK_AIR) || IsBlockLiquid(a_BlockType));
- }
+ BLOCKTYPE m_BlockType;
+ NIBBLETYPE m_BlockMeta;
+ Vector3i m_OriginalPosition;
} ;