1
0

Added falling block entities. Sand and gravel now properly fall down

Implemented the PACKET_SPAWN_OBJECT packet
Made some things use BLOCKTYPE instead of char

Android: Requests WebAdmin port when pressing the configure button


git-svn-id: http://mc-server.googlecode.com/svn/trunk@915 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
faketruth
2012-09-30 16:37:44 +00:00
parent 1d8921c151
commit ba2a9b6b2c
26 changed files with 254 additions and 70 deletions

View File

@@ -436,7 +436,7 @@ void cFluidSimulator::Simulate( float a_Dt )
bool cFluidSimulator::IsPassableForFluid(char a_BlockID)
bool cFluidSimulator::IsPassableForFluid(BLOCKTYPE a_BlockID)
{
return a_BlockID == E_BLOCK_AIR
|| a_BlockID == E_BLOCK_FIRE
@@ -448,7 +448,7 @@ bool cFluidSimulator::IsPassableForFluid(char a_BlockID)
bool cFluidSimulator::IsStationaryBlock (char a_BlockID)
bool cFluidSimulator::IsStationaryBlock (BLOCKTYPE a_BlockID)
{
return a_BlockID == m_StationaryFluidBlock;
}
@@ -457,7 +457,7 @@ bool cFluidSimulator::IsStationaryBlock (char a_BlockID)
bool cFluidSimulator::CanWashAway( char a_BlockID )
bool cFluidSimulator::CanWashAway( BLOCKTYPE a_BlockID )
{
switch( a_BlockID )
{
@@ -476,7 +476,7 @@ bool cFluidSimulator::CanWashAway( char a_BlockID )
bool cFluidSimulator::IsSolidBlock( char a_BlockID )
bool cFluidSimulator::IsSolidBlock( BLOCKTYPE a_BlockID )
{
return !(a_BlockID == E_BLOCK_AIR
|| a_BlockID == E_BLOCK_FIRE