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.cpp | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'source/FallingBlock.cpp') diff --git a/source/FallingBlock.cpp b/source/FallingBlock.cpp index 1ed9cd5ed..93eac0815 100644 --- a/source/FallingBlock.cpp +++ b/source/FallingBlock.cpp @@ -5,7 +5,7 @@ #include "ClientHandle.h" -CLASS_DEFINITION( cFallingBlock, cEntity ) + cFallingBlock::cFallingBlock(const Vector3i & a_BlockPosition, BLOCKTYPE a_BlockType) @@ -20,14 +20,6 @@ cFallingBlock::cFallingBlock(const Vector3i & a_BlockPosition, BLOCKTYPE a_Block -cFallingBlock::~cFallingBlock() -{ -} - - - - - void cFallingBlock::Initialize(cWorld * a_World) { super::Initialize( a_World ); @@ -55,10 +47,14 @@ void cFallingBlock::Tick(float a_Dt) //GetWorld()->BroadcastTeleportEntity(*this); // Testing position - Vector3i BlockPos( m_OriginalPosition.x, (int)(m_Pos.y-0.5), m_OriginalPosition.z ); - if( !IsPassable( GetWorld()->GetBlock( BlockPos ) ) ) + Vector3i BlockPos( m_OriginalPosition.x, (int)(m_Pos.y - 0.5), m_OriginalPosition.z ); + if (!IsPassable(GetWorld()->GetBlock(BlockPos))) { Destroy(); - GetWorld()->SetBlock( BlockPos.x, BlockPos.y+1, BlockPos.z, m_BlockType, 0 ); + GetWorld()->SetBlock( BlockPos.x, BlockPos.y + 1, BlockPos.z, m_BlockType, 0 ); } -} \ No newline at end of file +} + + + + -- cgit v1.2.3