From 85164fab8e5298ce1c0582b2aebb7e6a283d4a0c Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Mon, 1 Oct 2012 21:08:15 +0000 Subject: Slight refactoring of BlockHandlers - dropping unneeded virtual functions ( http://forum.mc-server.org/showthread.php?tid=434&pid=4734#pid4734 ) git-svn-id: http://mc-server.googlecode.com/svn/trunk@917 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/FluidSimulator.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'source/FluidSimulator.cpp') diff --git a/source/FluidSimulator.cpp b/source/FluidSimulator.cpp index 8cbe5054e..40fc1e606 100644 --- a/source/FluidSimulator.cpp +++ b/source/FluidSimulator.cpp @@ -350,14 +350,14 @@ void cFluidSimulator::Simulate( float a_Dt ) if( bIsFed ) { - char DownID = m_World->GetBlock( pos.x, pos.y-1, pos.z ); - bool bWashedAwayItem = CanWashAway( DownID ); - if( (IsPassableForFluid(DownID) || bWashedAwayItem) && !IsStationaryBlock(DownID) ) // free for fluid + char DownID = m_World->GetBlock(pos.x, pos.y - 1, pos.z); + bool bWashedAwayItem = CanWashAway(DownID); + if ((IsPassableForFluid(DownID) || bWashedAwayItem) && !IsStationaryBlock(DownID) ) // free for fluid { - if( bWashedAwayItem ) + if (bWashedAwayItem) { cBlockHandler * Handler = BlockHandler(DownID); - if(Handler->DropOnUnsuitable()) + if (Handler->DoesDropOnUnsuitable()) { Handler->DropBlock(m_World, pos.x, pos.y - 1, pos.z); } @@ -393,13 +393,13 @@ void cFluidSimulator::Simulate( float a_Dt ) if (bWashedAwayItem) { cBlockHandler * Handler = BlockHandler(DownID); - if(Handler->DropOnUnsuitable()) + if (Handler->DoesDropOnUnsuitable()) { Handler->DropBlock(m_World, p.x, p.y, p.z); } } - if( p.y == pos.y ) + if (p.y == pos.y) { m_World->FastSetBlock(p.x, p.y, p.z, m_FluidBlock, Meta + m_FlowReduction); } -- cgit v1.2.3