diff options
Diffstat (limited to 'source/FluidSimulator.cpp')
| -rw-r--r-- | source/FluidSimulator.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/source/FluidSimulator.cpp b/source/FluidSimulator.cpp index 40fc1e606..8a6a760f3 100644 --- a/source/FluidSimulator.cpp +++ b/source/FluidSimulator.cpp @@ -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)); } |