aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.hgignore2
-rw-r--r--src/server/game/Maps/MapManager.cpp7
2 files changed, 7 insertions, 2 deletions
diff --git a/.hgignore b/.hgignore
index 28429b4571b..b3586e3d808 100644
--- a/.hgignore
+++ b/.hgignore
@@ -7,6 +7,8 @@ build/
*.rej
*~
.git/
+*.kdev*
+.hgrignore
# use regexp syntax.
syntax: regexp
diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp
index a4036cfc299..a4fb3980242 100644
--- a/src/server/game/Maps/MapManager.cpp
+++ b/src/server/game/Maps/MapManager.cpp
@@ -47,10 +47,13 @@ MapManager::MapManager()
MapManager::~MapManager()
{
for (MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter)
- delete iter->second;
+ delete iter->second;
for (TransportSet::iterator i = m_Transports.begin(); i != m_Transports.end(); ++i)
- delete *i;
+ {
+ (*i)->RemoveFromWorld();
+ delete *i;
+ }
for (TransportNPCSet::iterator i = m_TransportNPCs.begin(); i != m_TransportNPCs.end(); ++i)
delete *i;