summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-03-02 13:15:44 -0700
committerJared Adams <jaxad0127@gmail.com>2010-03-02 13:25:06 -0700
commit2a70d4ba6e789075cd9bee1fea4f757186d68f76 (patch)
tree9854944940a4246101c7b57b001387cbf1945f95
parent54ec49e124f84f68f4eedf923fc23db0c3385899 (diff)
downloadmana-2a70d4ba6e789075cd9bee1fea4f757186d68f76.tar.gz
mana-2a70d4ba6e789075cd9bee1fea4f757186d68f76.tar.bz2
mana-2a70d4ba6e789075cd9bee1fea4f757186d68f76.tar.xz
mana-2a70d4ba6e789075cd9bee1fea4f757186d68f76.zip
Fix crash after viewport has been deleted
-rw-r--r--src/game.cpp23
1 files changed, 9 insertions, 14 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 2b9e932e..0f45d436 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -269,22 +269,17 @@ Game::~Game()
destroyGuiWindows();
- delete beingManager;
- delete player_node;
- delete floorItemManager;
- delete channelManager;
- delete commandHandler;
- delete joystick;
- delete particleEngine;
- delete viewport;
- delete mCurrentMap;
+ del_0(beingManager)
+ del_0(player_node)
+ del_0(floorItemManager)
+ del_0(channelManager)
+ del_0(commandHandler)
+ del_0(joystick)
+ del_0(particleEngine)
+ del_0(viewport)
+ del_0(mCurrentMap)
map_path = "";
- player_node = NULL;
- beingManager = NULL;
- floorItemManager = NULL;
- joystick = NULL;
-
mInstance = 0;
}