From 033af999ba419afadfa1830d288b021e7d9bc1f5 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Fri, 21 Dec 2012 12:21:20 +0000 Subject: Reworked the IsA() / GetClass() framework to actually be useful. Added GetParentClass(). git-svn-id: http://mc-server.googlecode.com/svn/trunk@1090 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/FallingBlock.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'source/FallingBlock.h') diff --git a/source/FallingBlock.h b/source/FallingBlock.h index 08e3302e1..f62b40a92 100644 --- a/source/FallingBlock.h +++ b/source/FallingBlock.h @@ -15,29 +15,31 @@ class cItem; -class cFallingBlock : public cEntity +class cFallingBlock : + public cEntity { typedef cEntity super; + public: - CLASS_PROTOTYPE(); + CLASS_PROTODEF(cFallingBlock); cFallingBlock(const Vector3i & a_BlockPosition, BLOCKTYPE a_BlockType); - ~cFallingBlock(); virtual void Initialize(cWorld * a_World) override; virtual void SpawnOn(cClientHandle & a_ClientHandle) override; virtual void Tick(float a_Dt) override; + private: BLOCKTYPE m_BlockType; Vector3i m_OriginalPosition; float m_SpeedY; - static bool IsPassable( BLOCKTYPE a_BlockType ) + static bool IsPassable(BLOCKTYPE a_BlockType) { - return a_BlockType == E_BLOCK_AIR || IsBlockLiquid( a_BlockType ); + return ((a_BlockType == E_BLOCK_AIR) || IsBlockLiquid(a_BlockType)); } -}; +} ; -- cgit v1.2.3