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

32
source/FireSimulator.cpp
View File

@@ -48,10 +48,10 @@ void cFireSimulator::Simulate( float a_Dt )
}
bool cFireSimulator::IsAllowedBlock( BLOCKTYPE a_BlockID )
bool cFireSimulator::IsAllowedBlock( BLOCKTYPE a_BlockType )
{
return a_BlockID == E_BLOCK_FIRE
|| IsBlockLava(a_BlockID);
return a_BlockType == E_BLOCK_FIRE
|| IsBlockLava(a_BlockType);
}
void cFireSimulator::AddBlock(int a_X, int a_Y, int a_Z)
@@ -78,26 +78,26 @@ void cFireSimulator::_AddBlock(int a_X, int a_Y, int a_Z)
}
bool cFireSimulator::IsForeverBurnable( BLOCKTYPE a_BlockID )
bool cFireSimulator::IsForeverBurnable( BLOCKTYPE a_BlockType )
{
return a_BlockID == E_BLOCK_BLOODSTONE;
return a_BlockType == E_BLOCK_BLOODSTONE;
}
bool cFireSimulator::IsBurnable( BLOCKTYPE a_BlockID )
bool cFireSimulator::IsBurnable( BLOCKTYPE a_BlockType )
{
return a_BlockID == E_BLOCK_PLANKS
|| a_BlockID == E_BLOCK_LEAVES
|| a_BlockID == E_BLOCK_LOG
|| a_BlockID == E_BLOCK_WOOL
|| a_BlockID == E_BLOCK_BOOKCASE
|| a_BlockID == E_BLOCK_FENCE
|| a_BlockID == E_BLOCK_TNT
|| a_BlockID == E_BLOCK_VINES;
return a_BlockType == E_BLOCK_PLANKS
|| a_BlockType == E_BLOCK_LEAVES
|| a_BlockType == E_BLOCK_LOG
|| a_BlockType == E_BLOCK_WOOL
|| a_BlockType == E_BLOCK_BOOKCASE
|| a_BlockType == E_BLOCK_FENCE
|| a_BlockType == E_BLOCK_TNT
|| a_BlockType == E_BLOCK_VINES;
}
bool cFireSimulator::FiresForever( BLOCKTYPE a_BlockID )
bool cFireSimulator::FiresForever( BLOCKTYPE a_BlockType )
{
return a_BlockID != E_BLOCK_FIRE;
return a_BlockType != E_BLOCK_FIRE;
}
bool cFireSimulator::BurnBlockAround(int a_X, int a_Y, int a_Z)