From eaa17b6a84d19e605549d6d1ea94eede98f77c67 Mon Sep 17 00:00:00 2001 From: faketruth Date: Tue, 14 Feb 2012 12:23:02 +0000 Subject: Fixed a (pretty big) memory leak in cSandSimulator git-svn-id: http://mc-server.googlecode.com/svn/trunk@252 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cSandSimulator.cpp | 24 ++++++++++++------------ source/cSandSimulator.h | 7 ++++--- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/source/cSandSimulator.cpp b/source/cSandSimulator.cpp index 9adde94e7..3fe678f90 100644 --- a/source/cSandSimulator.cpp +++ b/source/cSandSimulator.cpp @@ -13,8 +13,8 @@ cSandSimulator::cSandSimulator( cWorld* a_World ) : cSimulator(a_World) - , m_Blocks(new std::list ) - , m_Buffer(new std::list ) + , m_Blocks(new BlockList) + , m_Buffer(new BlockList) { } @@ -30,19 +30,19 @@ void cSandSimulator::Simulate( float a_Dt ) m_Buffer->clear(); std::swap( m_Blocks, m_Buffer ); - for( std::list::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; - char BlockID = m_World->GetBlock(Pos->x, Pos->y, Pos->z); + 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 ); + 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 ); + 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 ); } } @@ -60,13 +60,13 @@ void cSandSimulator::AddBlock(int a_X, int a_Y, int a_Z) if(!IsAllowedBlock(m_World->GetBlock(a_X, a_Y, a_Z))) //This should save very much time because it doesn´t have to iterate through all blocks return; - Vector3i *Block = new Vector3i(a_X, a_Y, a_Z); + Vector3i Block(a_X, a_Y, a_Z); //check for duplicates - for( std::list::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; } diff --git a/source/cSandSimulator.h b/source/cSandSimulator.h index 113a2492b..0a38172e8 100644 --- a/source/cSandSimulator.h +++ b/source/cSandSimulator.h @@ -2,8 +2,8 @@ #include "cSimulator.h" #include "cBlockEntity.h" #include +#include "Vector3i.h" -class Vector3i; class cWorld; class cSandSimulator : public cSimulator { @@ -20,6 +20,7 @@ public: protected: virtual void AddBlock(int a_X, int a_Y, int a_Z); - std::list *m_Blocks; - std::list *m_Buffer; + typedef std::list BlockList; + BlockList * m_Blocks; + BlockList * m_Buffer; }; \ No newline at end of file -- cgit v1.2.3