From ea2ed2c918bddf773bb8d10298016f4e5309d0b2 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Wed, 3 Oct 2012 08:52:11 +0000 Subject: Moved blockticking into blockhandler classes. 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 --- source/SandSimulator.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source/SandSimulator.cpp') diff --git a/source/SandSimulator.cpp b/source/SandSimulator.cpp index f8cfdad37..a2e1dc4cb 100644 --- a/source/SandSimulator.cpp +++ b/source/SandSimulator.cpp @@ -61,10 +61,10 @@ void cSandSimulator::Simulate( float a_Dt ) -bool cSandSimulator::IsAllowedBlock( BLOCKTYPE a_BlockID ) +bool cSandSimulator::IsAllowedBlock( BLOCKTYPE a_BlockType ) { - return a_BlockID == E_BLOCK_SAND - || a_BlockID == E_BLOCK_GRAVEL; + return a_BlockType == E_BLOCK_SAND + || a_BlockType == E_BLOCK_GRAVEL; } @@ -93,10 +93,10 @@ void cSandSimulator::AddBlock(int a_X, int a_Y, int a_Z) -bool cSandSimulator::IsPassable( BLOCKTYPE a_BlockID ) +bool cSandSimulator::IsPassable( BLOCKTYPE a_BlockType ) { - return a_BlockID == E_BLOCK_AIR - || IsBlockWater(a_BlockID) - || IsBlockLava(a_BlockID) - || a_BlockID == E_BLOCK_FIRE; + return a_BlockType == E_BLOCK_AIR + || IsBlockWater(a_BlockType) + || IsBlockLava(a_BlockType) + || a_BlockType == E_BLOCK_FIRE; } -- cgit v1.2.3