flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Slight refactoring of BlockHandlers - dropping unneeded virtual functions

Browse Source 
( 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
This commit is contained in:
madmaxoft@gmail.com
2012-10-01 21:08:15 +00:00
parent 673fdcd768
commit 85164fab8e
42 changed files with 862 additions and 513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/FluidSimulator.cpp
View File

@@ -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);
}