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

Moved blockticking into blockhandler classes.

Browse Source 
Also slightly refactored the variable / argument names (BlockID is deprecated, use BlockType instead)

git-svn-id: http://mc-server.googlecode.com/svn/trunk@921 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com
2012-10-03 08:52:11 +00:00
parent 9fa165488b
commit ea2ed2c918
75 changed files with 681 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/FluidSimulator.cpp
View File

@@ -436,30 +436,30 @@ void cFluidSimulator::Simulate( float a_Dt )
bool cFluidSimulator::IsPassableForFluid(BLOCKTYPE a_BlockID)
bool cFluidSimulator::IsPassableForFluid(BLOCKTYPE a_BlockType)
{
return a_BlockID == E_BLOCK_AIR
|| a_BlockID == E_BLOCK_FIRE
|| IsAllowedBlock(a_BlockID)
|| CanWashAway(a_BlockID);
return a_BlockType == E_BLOCK_AIR
|| a_BlockType == E_BLOCK_FIRE
|| IsAllowedBlock(a_BlockType)
|| CanWashAway(a_BlockType);
}
bool cFluidSimulator::IsStationaryBlock (BLOCKTYPE a_BlockID)
bool cFluidSimulator::IsStationaryBlock (BLOCKTYPE a_BlockType)
{
return a_BlockID == m_StationaryFluidBlock;
return a_BlockType == m_StationaryFluidBlock;
}
bool cFluidSimulator::CanWashAway( BLOCKTYPE a_BlockID )
bool cFluidSimulator::CanWashAway( BLOCKTYPE a_BlockType )
{
switch( a_BlockID )
switch( a_BlockType )
{
case E_BLOCK_YELLOW_FLOWER:
case E_BLOCK_RED_ROSE:
@@ -476,13 +476,13 @@ bool cFluidSimulator::CanWashAway( BLOCKTYPE a_BlockID )
bool cFluidSimulator::IsSolidBlock( BLOCKTYPE a_BlockID )
bool cFluidSimulator::IsSolidBlock( BLOCKTYPE a_BlockType )
{
return !(a_BlockID == E_BLOCK_AIR
|| a_BlockID == E_BLOCK_FIRE
|| IsBlockLava(a_BlockID)
|| IsBlockWater(a_BlockID)
|| CanWashAway(a_BlockID));
return !(a_BlockType == E_BLOCK_AIR
|| a_BlockType == E_BLOCK_FIRE
|| IsBlockLava(a_BlockType)
|| IsBlockWater(a_BlockType)
|| CanWashAway(a_BlockType));
}