Merge github.com:mana/manaserv

Conflicts:
	src/game-server/inventory.cpp
	src/game-server/inventory.h
	src/game-server/item.h
	src/game-server/main-game.cpp
	src/game-server/skillmanager.cpp
	src/utils/point.h

1 files changed, 6 insertions, 6 deletions

diff --git a/src/game-server/main-game.cpp b/src/game-server/main-game.cpp
index 529e0690..9d96a6ab 100644
--- a/src/game-server/main-game.cpp
+++ b/src/game-server/main-game.cpp
@@ -242,16 +242,16 @@ static void deinitializeServer()
     enet_deinitialize();
 
     // Destroy message handlers
-    delete gameHandler;
-    delete accountHandler;
-    delete postMan;
-    delete gBandwidth;
+    delete gameHandler; gameHandler = 0;
+    delete accountHandler; accountHandler = 0;
+    delete postMan; postMan = 0;
+    delete gBandwidth; gBandwidth = 0;
 
     // Destroy Managers
-    delete stringFilter;
+    delete stringFilter; stringFilter = 0;
     delete monsterManager; monsterManager = 0;
-    delete itemManager; itemManager = 0;
     delete skillManager; skillManager = 0;
+    delete itemManager; itemManager = 0;
     MapManager::deinitialize();
     StatusManager::deinitialize();