From 24efa6f8645c2f310997c212907fb4e591d0afec Mon Sep 17 00:00:00 2001 From: "lapayo94@gmail.com" Date: Thu, 22 Dec 2011 21:36:24 +0000 Subject: =?UTF-8?q?Digging=20leaves=20with=20shears=20now=20drops=20leaves?= =?UTF-8?q?=20Falling=20Sand=20now=20notifies=20water=20around=20Implement?= =?UTF-8?q?ed=20Function=20to=20get=20the=20relative=20chunk=20position=20?= =?UTF-8?q?in=20the=20total=20position=20(cChunk::PositionToWorldPosition)?= =?UTF-8?q?=20Pistons=20don=C2=B4t=20drop=20water=20and=20lava=20items=20a?= =?UTF-8?q?nymore=20when=20stopping=20water/lava=20implemented=20Getter=20?= =?UTF-8?q?for=20lava=20and=20water=20simulator=20IsBlockWater=20and=20IsB?= =?UTF-8?q?lockLava=20function=20in=20Defines.h?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://mc-server.googlecode.com/svn/trunk@97 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cChunk.cpp | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) (limited to 'source/cChunk.cpp') diff --git a/source/cChunk.cpp b/source/cChunk.cpp index b2cd443f8..0fe192c0b 100644 --- a/source/cChunk.cpp +++ b/source/cChunk.cpp @@ -5,8 +5,12 @@ #include // for mkdir #include #endif + + #include "cChunk.h" #include "cWorld.h" +#include "cWaterSimulator.h" +#include "cLavaSimulator.h" #include "cClientHandle.h" #include "cServer.h" #include "zlib.h" @@ -249,7 +253,13 @@ void cChunk::Tick(float a_Dt) { if( GetBlock( X, Y-1, Z ) == E_BLOCK_AIR ) { - SetBlock( X, Y, Z, 0, 0 ); + SetBlock( X, Y, Z, E_BLOCK_AIR, 0 ); + + int wX, wY, wZ; + PositionToWorldPosition(X, Y, Z, wX, wY, wZ); + + m_World->GetWaterSimulator()->WakeUp( wX, wY, wZ ); + m_World->GetLavaSimulator()->WakeUp( wX, wY, wZ ); if (isRedstone) { cRedstone Redstone(m_World); Redstone.ChangeRedstone( (X+m_PosX*16), (Y+m_PosY*16), (Z+m_PosZ*16), false ); @@ -291,7 +301,7 @@ void cChunk::Tick(float a_Dt) AddDirection( XX, YY, ZZ, Dir, true ); if( m_World->GetBlock( XX, YY, ZZ ) == E_BLOCK_AIR ) { - SetBlock( X, Y, Z, 0, 0 ); + SetBlock( X, Y, Z, E_BLOCK_AIR, 0 ); cPickup* Pickup = new cPickup( (X+m_PosX*16) * 32 + 16, (Y+m_PosY*128) * 32 + 16, (Z+m_PosZ*16) * 32 + 16, cItem( (ENUM_ITEM_ID)BlockID, 1 ) ); Pickup->Initialize( m_World ); } @@ -305,10 +315,19 @@ void cChunk::Tick(float a_Dt) case E_BLOCK_SAND: { char BottomBlock = GetBlock( X, Y-1, Z ); - if( BottomBlock == E_BLOCK_AIR || BottomBlock == E_BLOCK_WATER || BottomBlock == E_BLOCK_STATIONARY_WATER || BottomBlock == E_BLOCK_LAVA || BottomBlock == E_BLOCK_STATIONARY_LAVA ) + if( BottomBlock == E_BLOCK_AIR || IsBlockWater(BottomBlock) || IsBlockLava(BottomBlock) ) { - SetBlock( X, Y, Z, 0, 0 ); + SetBlock( X, Y, Z, E_BLOCK_AIR, 0 ); SetBlock( X, Y-1, Z, BlockID, 0 ); + + int wX, wY, wZ; + + PositionToWorldPosition(X, Y, Z, wX, wY, wZ); + + m_World->GetWaterSimulator()->WakeUp( wX, wY, wZ ); + m_World->GetLavaSimulator()->WakeUp( wX, wY, wZ ); + m_World->GetWaterSimulator()->WakeUp( wX, wY - 1, wZ ); + m_World->GetLavaSimulator()->WakeUp( wX, wY - 1, wZ ); } } break; @@ -1448,3 +1467,11 @@ void cChunk::RemoveTickBlockEntity( cFurnaceEntity* a_Entity ) { m_pState->m_TickBlockEntities.remove( a_Entity ); } + + +void cChunk::PositionToWorldPosition(int a_ChunkX, int a_ChunkY, int a_ChunkZ, int & a_X, int & a_Y, int & a_Z) +{ + a_Y = a_ChunkY; + a_X = m_PosX * 16 + a_ChunkX; + a_Z = m_PosZ * 16 + a_ChunkZ; +} \ No newline at end of file -- cgit v1.2.3