summaryrefslogtreecommitdiffstats
path: root/source/FluidSimulator.cpp
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-10-03 10:52:11 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-10-03 10:52:11 +0200
commitea2ed2c918bddf773bb8d10298016f4e5309d0b2 (patch)
tree129848747361501cbc2e330e1a33b7f8089f51b2 /source/FluidSimulator.cpp
parentsTick: Updated the plugin to work with current code (diff)
downloadcuberite-ea2ed2c918bddf773bb8d10298016f4e5309d0b2.tar
cuberite-ea2ed2c918bddf773bb8d10298016f4e5309d0b2.tar.gz
cuberite-ea2ed2c918bddf773bb8d10298016f4e5309d0b2.tar.bz2
cuberite-ea2ed2c918bddf773bb8d10298016f4e5309d0b2.tar.lz
cuberite-ea2ed2c918bddf773bb8d10298016f4e5309d0b2.tar.xz
cuberite-ea2ed2c918bddf773bb8d10298016f4e5309d0b2.tar.zst
cuberite-ea2ed2c918bddf773bb8d10298016f4e5309d0b2.zip
Diffstat (limited to '')
-rw-r--r--source/FluidSimulator.cpp30
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));
}