summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-10-21 15:34:26 +0000
committerGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-10-21 15:34:26 +0000
commit40e1b46019afe72bb05614162b3b907db999cc57 (patch)
treea943aa93824e7aec960e0e5fcd10060bb31c5dbe
parent137237efd9af589649c50a09ab6ce1cbb8c47c72 (diff)
downloadmana-40e1b46019afe72bb05614162b3b907db999cc57.tar.gz
mana-40e1b46019afe72bb05614162b3b907db999cc57.tar.bz2
mana-40e1b46019afe72bb05614162b3b907db999cc57.tar.xz
mana-40e1b46019afe72bb05614162b3b907db999cc57.zip
Messed a bit: beings cannot be removed from no map.
-rw-r--r--ChangeLog4
-rw-r--r--src/game.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ba3e086..cac92732 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,8 +12,8 @@
src/gui/serverdialog.cpp, src/gui/inventorywindow.cpp: Removed window
padding and replaced it by layout margin, so that the grip on resizable
window is not outside the inner clip area.
- * src/engine.cpp, src/engine.h: Fixed current map not deleted on server
- change.
+ * src/engine.cpp, src/engine.h, src/game.cpp: Fixed current map not
+ deleted on server change.
* src/gui/inventorywindow.cpp, src/gui/inventorywindow.h: Removed
redundant destructor.
* src/resources/monsterdb.cpp: Plugged memory leak in database reader.
diff --git a/src/game.cpp b/src/game.cpp
index 176d9642..53874f4d 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -287,7 +287,6 @@ Game::~Game()
{
Net::clearHandlers();
- delete engine;
delete player_node;
destroyGuiWindows();
@@ -296,6 +295,7 @@ Game::~Game()
delete channelManager;
delete joystick;
delete particleEngine;
+ delete engine;
viewport->setMap(NULL);
player_node = NULL;