flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed the same leak in FireSimulator

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@253 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
faketruth 2012-02-14 12:29:39 +00:00
parent eaa17b6a84
commit 504803cb6d
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/cFireSimulator.cpp
View File

@ -9,9 +9,9 @@
cFireSimulator::cFireSimulator( cWorld* a_World )
: cSimulator(a_World)
, m_Blocks(new std::vector <Vector3i *>)
, m_Buffer(new std::vector <Vector3i *>)
, m_BurningBlocks(new std::vector <Vector3i *>)
, m_Blocks(new BlockList)
, m_Buffer(new BlockList)
, m_BurningBlocks(new BlockList)
{
}
@ -28,20 +28,20 @@ void cFireSimulator::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 )
for( BlockList::iterator itr = m_Buffer->begin(); itr != m_Buffer->end(); ++itr )
{
Vector3i *Pos = *itr;
Vector3i Pos = *itr;
char BlockID = m_World->GetBlock(Pos->x, Pos->y, Pos->z);
char BlockID = m_World->GetBlock(Pos.x, Pos.y, Pos.z);
if(!IsAllowedBlock(BlockID)) //Check wheather the block is still burning
continue;
if(BurnBlockAround(Pos->x, Pos->y, Pos->z)) //Burn single block and if there was one -> next time again
_AddBlock(Pos->x, Pos->y, Pos->z);
if(BurnBlockAround(Pos.x, Pos.y, Pos.z)) //Burn single block and if there was one -> next time again
_AddBlock(Pos.x, Pos.y, Pos.z);
else
if(!IsForeverBurnable(m_World->GetBlock(Pos->x, Pos->y - 1, Pos->z)) && !FiresForever(BlockID))
m_World->SetBlock(Pos->x, Pos->y, Pos->z, E_BLOCK_AIR, 0);
if(!IsForeverBurnable(m_World->GetBlock(Pos.x, Pos.y - 1, Pos.z)) && !FiresForever(BlockID))
m_World->SetBlock(Pos.x, Pos.y, Pos.z, E_BLOCK_AIR, 0);
}
@ -61,10 +61,10 @@ void cFireSimulator::AddBlock(int a_X, int a_Y, int a_Z)
return;
//check for duplicates
for( std::vector<Vector3i *>::iterator itr = m_Blocks->begin(); itr != m_Blocks->end(); ++itr )
for( BlockList::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 )
Vector3i Pos = *itr;
if( Pos.x == a_X && Pos.y == a_Y && Pos.z == a_Z )
return;
}
@ -74,8 +74,7 @@ void cFireSimulator::AddBlock(int a_X, int a_Y, int a_Z)
void cFireSimulator::_AddBlock(int a_X, int a_Y, int a_Z)
{
Vector3i *Block = new Vector3i(a_X, a_Y, a_Z);
m_Blocks->push_back(Block);
m_Blocks->push_back( Vector3i(a_X, a_Y, a_Z) );
}

7
source/cFireSimulator.h
View File

@ -25,8 +25,9 @@ protected:
virtual bool BurnBlockAround(int a_X, int a_Y, int a_Z);
virtual bool BurnBlock(int a_X, int a_Y, int a_Z);
std::vector <Vector3i *> *m_Blocks;
std::vector <Vector3i *> *m_Buffer;
typedef std::vector <Vector3i> BlockList;
BlockList *m_Blocks;
BlockList *m_Buffer;
std::vector <Vector3i *> *m_BurningBlocks;
BlockList *m_BurningBlocks;
};