9f77572fb0
-> Manager handles all ticks -> advantage: Much easier to add new simulators, because you only have to register them in the manager - moved sand and gravel simulation to a Simulator-class (cSandSimulator) - Made Squid a little bit more funny and realistic, because it dies now when it´s not in water -Escaping mobs run now faster than normal (They just walked away before :D) git-svn-id: http://mc-server.googlecode.com/svn/trunk@125 0a769ca7-a7f5-676a-18bf-c427514a06d6
74 lines
1.6 KiB
C++
74 lines
1.6 KiB
C++
#include "cSandSimulator.h"
|
|
#include "cWorld.h"
|
|
#include "Vector3i.h"
|
|
#include "BlockID.h"
|
|
#include "Defines.h"
|
|
#include <vector>
|
|
|
|
cSandSimulator::cSandSimulator( cWorld* a_World )
|
|
: cSimulator(a_World)
|
|
, m_Blocks(new std::vector <Vector3i *>)
|
|
, m_Buffer(new std::vector <Vector3i *>)
|
|
{
|
|
|
|
}
|
|
|
|
cSandSimulator::~cSandSimulator()
|
|
{
|
|
delete m_Buffer;
|
|
delete m_Blocks;
|
|
}
|
|
|
|
void cSandSimulator::Simulate( float a_Dt )
|
|
{
|
|
m_Buffer->clear();
|
|
std::swap( m_Blocks, m_Buffer );
|
|
|
|
for( std::vector<Vector3i *>::iterator itr = m_Buffer->begin(); itr != m_Buffer->end(); ++itr )
|
|
{
|
|
Vector3i *Pos = *itr;
|
|
char BlockID = m_World->GetBlock(Pos->x, Pos->y, Pos->z);
|
|
if(!IsAllowedBlock(BlockID))
|
|
continue;
|
|
|
|
char BottomBlock = m_World->GetBlock( Pos->x, Pos->y - 1, Pos->z );
|
|
|
|
if( IsPassable(BottomBlock) )
|
|
{
|
|
m_World->SetBlock( Pos->x, Pos->y, Pos->z, E_BLOCK_AIR, 0 );
|
|
m_World->SetBlock( Pos->x, Pos->y - 1, Pos->z, BlockID, 0 );
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
|
|
bool cSandSimulator::IsAllowedBlock( char a_BlockID )
|
|
{
|
|
return a_BlockID == E_BLOCK_SAND
|
|
|| a_BlockID == E_BLOCK_GRAVEL;
|
|
}
|
|
|
|
void cSandSimulator::AddBlock(int a_X, int a_Y, int a_Z)
|
|
{
|
|
Vector3i *Block = new Vector3i(a_X, a_Y, a_Z);
|
|
|
|
//check for duplicates
|
|
for( std::vector<Vector3i *>::iterator itr = m_Blocks->begin(); itr != m_Blocks->end(); ++itr )
|
|
{
|
|
Vector3i *Pos = *itr;
|
|
if( Pos->x == a_X && Pos->y == a_Y && Pos->z == a_Z )
|
|
return;
|
|
}
|
|
|
|
m_Blocks->push_back(Block);
|
|
|
|
}
|
|
|
|
bool cSandSimulator::IsPassable( char a_BlockID )
|
|
{
|
|
return a_BlockID == E_BLOCK_AIR
|
|
|| IsBlockWater(a_BlockID)
|
|
|| IsBlockLava(a_BlockID);
|
|
|
|
} |