From 4b13b0bf18cb17a7a50e824786d944359970f419 Mon Sep 17 00:00:00 2001 From: H0zen Date: Wed, 23 Dec 2015 21:05:55 +0200 Subject: [PATCH] Some minor fixes. --- src/game/WorldHandlers/GridMap.h | 2 +- src/game/WorldHandlers/World.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/game/WorldHandlers/GridMap.h b/src/game/WorldHandlers/GridMap.h index c501f9a8..5b5410af 100644 --- a/src/game/WorldHandlers/GridMap.h +++ b/src/game/WorldHandlers/GridMap.h @@ -286,7 +286,7 @@ class TerrainInfo : public Referencable }; // class for managing TerrainData object and all sort of geometry querying operations -class TerrainManager : public MaNGOS::Singleton, MaNGOS::ClassLevelLockable +class TerrainManager : public MaNGOS::Singleton > { typedef UNORDERED_MAP TerrainDataMap; friend class MaNGOS::OperatorNew; diff --git a/src/game/WorldHandlers/World.cpp b/src/game/WorldHandlers/World.cpp index 7ce34b51..0ced1369 100644 --- a/src/game/WorldHandlers/World.cpp +++ b/src/game/WorldHandlers/World.cpp @@ -151,12 +151,14 @@ World::~World() while (cliCmdQueue.next(command)) { delete command; } + WorldSession* session = NULL; + while (addSessQueue.next(session)) + { delete session; } + VMAP::VMapFactory::clear(); MMAP::MMapFactory::clear(); delete m_configForceLoadMapIds; - - // TODO free addSessQueue } /// Cleanups before world stop