From 1454d237d1c350eb4ccbf786be802893791c2f9e Mon Sep 17 00:00:00 2001 From: "lapayo94@gmail.com" Date: Wed, 28 Dec 2011 16:01:15 +0000 Subject: [PATCH] Fixed some small memory leaks git-svn-id: http://mc-server.googlecode.com/svn/trunk@148 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cClientHandle.cpp | 5 +++++ source/cFluidSimulator.cpp | 6 ++++++ source/cWorld.cpp | 2 ++ 3 files changed, 13 insertions(+) diff --git a/source/cClientHandle.cpp b/source/cClientHandle.cpp index 6bde57bbc..e27ed4ecb 100644 --- a/source/cClientHandle.cpp +++ b/source/cClientHandle.cpp @@ -231,6 +231,11 @@ cClientHandle::~cClientHandle() delete *m_pState->PendingNrmSendPackets.begin(); m_pState->PendingNrmSendPackets.erase( m_pState->PendingNrmSendPackets.begin() ); } + while( !m_pState->PendingLowSendPackets.empty() ) + { + delete *m_pState->PendingLowSendPackets.begin(); + m_pState->PendingLowSendPackets.erase( m_pState->PendingLowSendPackets.begin() ); + } if(m_Player) { m_Player->SetClientHandle( 0 ); diff --git a/source/cFluidSimulator.cpp b/source/cFluidSimulator.cpp index 9c2b02e76..47cf0be19 100644 --- a/source/cFluidSimulator.cpp +++ b/source/cFluidSimulator.cpp @@ -15,6 +15,12 @@ public: , m_World( a_World ) {} + ~FluidData() + { + delete m_Buffer; + delete m_ActiveFluid; + } + std::vector< Vector3i > GetLowestPoints( int a_X, int a_Y, int a_Z ) { std::vector< Vector3i > Points; diff --git a/source/cWorld.cpp b/source/cWorld.cpp index 3d984019c..7e847d32c 100644 --- a/source/cWorld.cpp +++ b/source/cWorld.cpp @@ -135,6 +135,8 @@ cWorld::~cWorld() delete m_EntitiesCriticalSection; m_EntitiesCriticalSection = 0; delete m_ChunksCriticalSection; m_ChunksCriticalSection = 0; delete m_pState; + + delete m_WorldGenerator; } cWorld::cWorld( const char* a_WorldName )