From ba2a9b6b2c1519563662a6a1147a82f96afb36dc Mon Sep 17 00:00:00 2001 From: faketruth Date: Sun, 30 Sep 2012 16:37:44 +0000 Subject: Added falling block entities. Sand and gravel now properly fall down Implemented the PACKET_SPAWN_OBJECT packet Made some things use BLOCKTYPE instead of char Android: Requests WebAdmin port when pressing the configure button git-svn-id: http://mc-server.googlecode.com/svn/trunk@915 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/FluidSimulator.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/FluidSimulator.cpp') diff --git a/source/FluidSimulator.cpp b/source/FluidSimulator.cpp index d8007b9bf..8cbe5054e 100644 --- a/source/FluidSimulator.cpp +++ b/source/FluidSimulator.cpp @@ -436,7 +436,7 @@ void cFluidSimulator::Simulate( float a_Dt ) -bool cFluidSimulator::IsPassableForFluid(char a_BlockID) +bool cFluidSimulator::IsPassableForFluid(BLOCKTYPE a_BlockID) { return a_BlockID == E_BLOCK_AIR || a_BlockID == E_BLOCK_FIRE @@ -448,7 +448,7 @@ bool cFluidSimulator::IsPassableForFluid(char a_BlockID) -bool cFluidSimulator::IsStationaryBlock (char a_BlockID) +bool cFluidSimulator::IsStationaryBlock (BLOCKTYPE a_BlockID) { return a_BlockID == m_StationaryFluidBlock; } @@ -457,7 +457,7 @@ bool cFluidSimulator::IsStationaryBlock (char a_BlockID) -bool cFluidSimulator::CanWashAway( char a_BlockID ) +bool cFluidSimulator::CanWashAway( BLOCKTYPE a_BlockID ) { switch( a_BlockID ) { @@ -476,7 +476,7 @@ bool cFluidSimulator::CanWashAway( char a_BlockID ) -bool cFluidSimulator::IsSolidBlock( char a_BlockID ) +bool cFluidSimulator::IsSolidBlock( BLOCKTYPE a_BlockID ) { return !(a_BlockID == E_BLOCK_AIR || a_BlockID == E_BLOCK_FIRE -- cgit v1.2.3