Patch with diff file created by Sebi (implemented some stuff like lava physics, drops are deleted when in lava, water is now slower, lava gives actual damage etc.). Pistons now work mostly as they should. They do not yet show the motion animation and do not emit sound. They do extend, push, and retract as they should though. Right now the only way to activate a piston is to light redstone wire adjacent to it with a redstone torch.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@67 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
admin@omencraft.com
216
source/cLavaSimulator.cpp
Normal file
216
source/cLavaSimulator.cpp
Normal file
@@ -0,0 +1,216 @@
|
||||
#include "cLavaSimulator.h"
|
||||
#include "cWorld.h"
|
||||
#include "Vector3i.h"
|
||||
#include "BlockID.h"
|
||||
#include <vector>
|
||||
|
||||
class cLavaSimulator::LavaData
|
||||
{
|
||||
public:
|
||||
LavaData( cWorld* a_World )
|
||||
: m_ActiveLava( new std::vector< Vector3i >() )
|
||||
, m_Buffer( new std::vector< Vector3i >() )
|
||||
, m_World( a_World )
|
||||
{}
|
||||
|
||||
std::vector< Vector3i > GetLowestPoints( int a_X, int a_Y, int a_Z )
|
||||
{
|
||||
std::vector< Vector3i > Points;
|
||||
if( m_World->GetBlock(a_X, a_Y-1, a_Z) == E_BLOCK_AIR )
|
||||
{
|
||||
Points.push_back( Vector3i( a_X, a_Y-1, a_Z ) );
|
||||
return Points;
|
||||
}
|
||||
|
||||
Vector3i LowerPoints [] = {
|
||||
Vector3i( a_X-1, a_Y-1, a_Z ),
|
||||
Vector3i( a_X+1, a_Y-1, a_Z ),
|
||||
Vector3i( a_X, a_Y-1, a_Z-1 ),
|
||||
Vector3i( a_X, a_Y-1, a_Z+1 ),
|
||||
};
|
||||
bool bLavaFound = false;
|
||||
for( int i = 0; i < 4; ++i )
|
||||
{
|
||||
char Block1 = m_World->GetBlock( LowerPoints[i].x, LowerPoints[i].y, LowerPoints[i].z );
|
||||
char Block2 = m_World->GetBlock( LowerPoints[i].x, a_Y, LowerPoints[i].z );
|
||||
if( Block1 == E_BLOCK_AIR && Block2 == E_BLOCK_AIR )
|
||||
{
|
||||
Points.push_back( LowerPoints[i] );
|
||||
LowerPoints[i].y = a_Y;
|
||||
Points.push_back( LowerPoints[i] );
|
||||
}
|
||||
else if( (Block2 == E_BLOCK_LAVA || Block2 == E_BLOCK_STATIONARY_LAVA ) && ( Block1 == E_BLOCK_AIR || Block1 == E_BLOCK_LAVA || Block1 == E_BLOCK_STATIONARY_LAVA ) )
|
||||
{
|
||||
bLavaFound = true;
|
||||
}
|
||||
}
|
||||
|
||||
if( Points.size() == 0 && !bLavaFound )
|
||||
{
|
||||
Vector3i LevelPoints [] = {
|
||||
Vector3i( a_X-1, a_Y, a_Z ),
|
||||
Vector3i( a_X+1, a_Y, a_Z ),
|
||||
Vector3i( a_X, a_Y, a_Z-1 ),
|
||||
Vector3i( a_X, a_Y, a_Z+1 ),
|
||||
};
|
||||
for( int i = 0; i < 4; ++i )
|
||||
{
|
||||
char Block = m_World->GetBlock( LevelPoints[i].x, a_Y, LevelPoints[i].z );
|
||||
if( Block == E_BLOCK_AIR || Block == E_BLOCK_LAVA || Block == E_BLOCK_STATIONARY_LAVA )
|
||||
Points.push_back( LevelPoints[i] );
|
||||
}
|
||||
}
|
||||
return Points;
|
||||
}
|
||||
|
||||
std::vector< Vector3i >* m_ActiveLava;
|
||||
std::vector< Vector3i >* m_Buffer;
|
||||
cWorld* m_World;
|
||||
};
|
||||
|
||||
cLavaSimulator::cLavaSimulator( cWorld* a_World )
|
||||
: m_World( a_World )
|
||||
, m_Data( new LavaData( a_World ) )
|
||||
{
|
||||
}
|
||||
|
||||
cLavaSimulator::~cLavaSimulator()
|
||||
{
|
||||
}
|
||||
|
||||
void cLavaSimulator::WakeUp( int a_X, int a_Y, int a_Z )
|
||||
{
|
||||
AddBlock( a_X, a_Y, a_Z );
|
||||
AddBlock( a_X-1, a_Y, a_Z );
|
||||
AddBlock( a_X+1, a_Y, a_Z );
|
||||
AddBlock( a_X, a_Y-1, a_Z );
|
||||
AddBlock( a_X, a_Y+1, a_Z );
|
||||
AddBlock( a_X, a_Y, a_Z-1 );
|
||||
AddBlock( a_X, a_Y, a_Z+1 );
|
||||
}
|
||||
|
||||
void cLavaSimulator::AddBlock( int a_X, int a_Y, int a_Z )
|
||||
{
|
||||
// Check for duplicates
|
||||
std::vector< Vector3i > & ActiveLava = *m_Data->m_ActiveLava;
|
||||
for( std::vector< Vector3i >::iterator itr = ActiveLava.begin(); itr != ActiveLava.end(); ++itr )
|
||||
{
|
||||
Vector3i & pos = *itr;
|
||||
if( pos.x == a_X && pos.y == a_Y && pos.z == a_Z )
|
||||
return;
|
||||
}
|
||||
|
||||
ActiveLava.push_back( Vector3i( a_X, a_Y, a_Z ) );
|
||||
}
|
||||
|
||||
char cLavaSimulator::GetHighestLevelAround( int a_X, int a_Y, int a_Z )
|
||||
{
|
||||
char Max = 8;
|
||||
#define __HIGHLEVEL_CHECK__( x, y, z ) \
|
||||
if( IsLavaBlock( m_World->GetBlock( x, y, z ) ) ) \
|
||||
{ \
|
||||
char Meta; \
|
||||
if( (Meta = m_World->GetBlockMeta( x, y, z ) ) < Max ) Max = Meta; \
|
||||
else if( Meta == 8 ) Max = 0; \
|
||||
if( Max == 0 ) return 0; \
|
||||
}
|
||||
|
||||
__HIGHLEVEL_CHECK__( a_X-1, a_Y, a_Z );
|
||||
__HIGHLEVEL_CHECK__( a_X+1, a_Y, a_Z );
|
||||
__HIGHLEVEL_CHECK__( a_X, a_Y, a_Z-1 );
|
||||
__HIGHLEVEL_CHECK__( a_X, a_Y, a_Z+1 );
|
||||
|
||||
return Max;
|
||||
}
|
||||
|
||||
void cLavaSimulator::Simulate( float a_Dt )
|
||||
{
|
||||
m_Timer += a_Dt;
|
||||
|
||||
std::swap( m_Data->m_ActiveLava, m_Data->m_Buffer ); // Swap so blocks can be added to empty ActiveLava array
|
||||
m_Data->m_ActiveLava->clear();
|
||||
|
||||
std::vector< Vector3i > & LavaBlocks = *m_Data->m_Buffer;
|
||||
for( std::vector< Vector3i >::iterator itr = LavaBlocks.begin(); itr != LavaBlocks.end(); ++itr )
|
||||
{
|
||||
Vector3i & pos = *itr;
|
||||
char BlockID = m_World->GetBlock( pos.x, pos.y, pos.z );
|
||||
if( IsLavaBlock( BlockID ) ) // only care about lava
|
||||
{
|
||||
bool bIsFed = false;
|
||||
char Meta = m_World->GetBlockMeta( pos.x, pos.y, pos.z );
|
||||
char Feed = Meta;
|
||||
if( Meta == 8 ) // Falling lava
|
||||
{
|
||||
if( IsLavaBlock( m_World->GetBlock(pos.x, pos.y+1, pos.z) ) ) // Block above is lava
|
||||
{
|
||||
bIsFed = true;
|
||||
Meta = 0; // Make it a full block
|
||||
}
|
||||
}
|
||||
else if( Meta <= 2 )
|
||||
{
|
||||
bIsFed = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
if( (Feed = GetHighestLevelAround( pos.x, pos.y, pos.z )) < Meta )
|
||||
bIsFed = true;
|
||||
}
|
||||
|
||||
|
||||
if( bIsFed )
|
||||
{
|
||||
char DownID = m_World->GetBlock( pos.x, pos.y-1, pos.z );
|
||||
if( DownID == E_BLOCK_AIR || IsLavaBlock( DownID ) ) // free for Lava
|
||||
{
|
||||
m_World->FastSetBlock( pos.x, pos.y-1, pos.z, E_BLOCK_LAVA, 8 ); // falling
|
||||
AddBlock( pos.x, pos.y-1, pos.z );
|
||||
}
|
||||
else // Not falling Lava
|
||||
{
|
||||
if( Feed+2 < Meta )
|
||||
{
|
||||
m_World->FastSetBlock( pos.x, pos.y, pos.z, E_BLOCK_LAVA, Feed+2 );
|
||||
AddBlock( pos.x, pos.y, pos.z );
|
||||
}
|
||||
else if( Meta < 6 ) // 7 is only 1 unit high, so it cannot spread, lower than 7 can though.
|
||||
{
|
||||
std::vector< Vector3i > Points = m_Data->GetLowestPoints( pos.x, pos.y, pos.z );
|
||||
for( std::vector< Vector3i >::iterator itr = Points.begin(); itr != Points.end(); ++itr )
|
||||
{
|
||||
Vector3i & p = *itr;
|
||||
char BlockID = m_World->GetBlock( p.x, p.y, p.z );
|
||||
if( !IsLavaBlock( BlockID ) )
|
||||
{
|
||||
if( p.y == pos.y )
|
||||
m_World->FastSetBlock(p.x, p.y, p.z, E_BLOCK_LAVA, Meta+2);
|
||||
else
|
||||
m_World->FastSetBlock(p.x, p.y, p.z, E_BLOCK_LAVA, 8);
|
||||
AddBlock( p.x, p.y, p.z );
|
||||
}
|
||||
else // it's Lava
|
||||
{
|
||||
char PointMeta = m_World->GetBlockMeta( p.x, p.y, p.z );
|
||||
if( PointMeta > Meta+2 )
|
||||
{
|
||||
AddBlock( p.x, p.y, p.z );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else // not fed
|
||||
{
|
||||
m_World->FastSetBlock( pos.x, pos.y, pos.z, E_BLOCK_AIR, 0 );
|
||||
WakeUp( pos.x, pos.y, pos.z );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool cLavaSimulator::IsLavaBlock( char a_BlockID )
|
||||
{
|
||||
return a_BlockID == E_BLOCK_LAVA || a_BlockID == E_BLOCK_STATIONARY_LAVA;
|
||||
}
|
||||
Reference in New Issue
Block a user