From bcfa72e0341c911bf6c020765d1ffe16ccfb72e1 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Sun, 26 Nov 2006 15:49:11 +0000 Subject: ItemDB needs to be unloaded before deleting the resource manager instance, since ItemInfo refers to an Image. --- ChangeLog | 4 +++- src/main.cpp | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index dfde4d60..96e33a15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ * src/resources/spritedef.cpp, src/resources/spritedef.h: Some refactoring, splitting up the loading into several methods, in preparation of adding support for including other sprites. + * src/main.cpp: ItemDB needs to be unloaded before deleting the + resource manager instance, since ItemInfo refers to an Image. 2006-11-26 Philipp Sehmisch @@ -38,7 +40,7 @@ src/gui/shop.cpp, src/net/inventoryhandler.cpp, src/resources/itemdb.cpp, src/resources/itemdb.h, src/resources/iteminfo.h, src/resources/itemmanager.cpp, - src/resources/itemmanager.h: Refectored the Itemmanager class to an + src/resources/itemmanager.h: Refactored the Itemmanager class to an ItemDB namespace. 2006-11-23 Eugenio Favalli diff --git a/src/main.cpp b/src/main.cpp index 70bc469b..0faf5c12 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -331,12 +331,12 @@ void exit_engine() // Shutdown sound sound.close(); - ResourceManager::deleteInstance(); - delete logger; - // Unload XML databases EquipmentDB::unload(); ItemDB::unload(); + + ResourceManager::deleteInstance(); + delete logger; } void printHelp() -- cgit v1.2.3-70-g09d2