diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-11-26 15:49:11 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-11-26 15:49:11 +0000 |
commit | bcfa72e0341c911bf6c020765d1ffe16ccfb72e1 (patch) | |
tree | 431c3904fded3e1f38aaf928d323e15b3e7c5058 | |
parent | 7f819e46b584145e2cf2ea742ced9fab0ffc233e (diff) | |
download | mana-bcfa72e0341c911bf6c020765d1ffe16ccfb72e1.tar.gz mana-bcfa72e0341c911bf6c020765d1ffe16ccfb72e1.tar.bz2 mana-bcfa72e0341c911bf6c020765d1ffe16ccfb72e1.tar.xz mana-bcfa72e0341c911bf6c020765d1ffe16ccfb72e1.zip |
ItemDB needs to be unloaded before deleting the resource manager instance,
since ItemInfo refers to an Image.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | src/main.cpp | 6 |
2 files changed, 6 insertions, 4 deletions
@@ -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 <tmw@crushnet.org> @@ -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 <elvenprogrammer@gmail.com> 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() |