summaryrefslogtreecommitdiffstats
path: root/source/FluidSimulator.h
diff options
context:
space:
mode:
authorfaketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-09-30 18:37:44 +0200
committerfaketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-09-30 18:37:44 +0200
commitba2a9b6b2c1519563662a6a1147a82f96afb36dc (patch)
treef176e14fa7afa14a3e598350779bcb755b9d0339 /source/FluidSimulator.h
parentFixed initial player head rotation when a player is being spawned on another client (diff)
downloadcuberite-ba2a9b6b2c1519563662a6a1147a82f96afb36dc.tar
cuberite-ba2a9b6b2c1519563662a6a1147a82f96afb36dc.tar.gz
cuberite-ba2a9b6b2c1519563662a6a1147a82f96afb36dc.tar.bz2
cuberite-ba2a9b6b2c1519563662a6a1147a82f96afb36dc.tar.lz
cuberite-ba2a9b6b2c1519563662a6a1147a82f96afb36dc.tar.xz
cuberite-ba2a9b6b2c1519563662a6a1147a82f96afb36dc.tar.zst
cuberite-ba2a9b6b2c1519563662a6a1147a82f96afb36dc.zip
Diffstat (limited to 'source/FluidSimulator.h')
-rw-r--r--source/FluidSimulator.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/source/FluidSimulator.h b/source/FluidSimulator.h
index 1ec254595..20d86b1b8 100644
--- a/source/FluidSimulator.h
+++ b/source/FluidSimulator.h
@@ -29,11 +29,11 @@ public:
//Gets the flowing direction. if a_Over is true also the block over the current block affects the direction (standard)
Direction GetFlowingDirection(int a_X, int a_Y, int a_Z, bool a_Over = true);
- virtual bool IsAllowedBlock( char a_BlockID ) = 0;
- virtual bool IsStationaryBlock( char a_BlockID);
- virtual bool IsPassableForFluid( char a_BlockID );
- bool CanWashAway( char a_BlockID );
- bool IsSolidBlock(char a_BlockID);
+ virtual bool IsAllowedBlock( BLOCKTYPE a_BlockID ) = 0;
+ virtual bool IsStationaryBlock( BLOCKTYPE a_BlockID);
+ virtual bool IsPassableForFluid( BLOCKTYPE a_BlockID );
+ bool CanWashAway( BLOCKTYPE a_BlockID );
+ bool IsSolidBlock(BLOCKTYPE a_BlockID);
protected:
virtual void AddBlock( int a_X, int a_Y, int a_Z);
char GetHighestLevelAround( int a_X, int a_Y, int a_Z );
@@ -47,8 +47,8 @@ protected:
FluidData* m_Data;
//Customize
- char m_FluidBlock;
- char m_StationaryFluidBlock;
+ BLOCKTYPE m_FluidBlock;
+ BLOCKTYPE m_StationaryFluidBlock;
char m_MaxHeight;
char m_FlowReduction;