summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-03-11 13:37:16 -0600
committerJared Adams <jaxad0127@gmail.com>2009-03-11 13:37:16 -0600
commit2ff5ba5d01d79c0c3781ab160b023a62b14d26e6 (patch)
treee1026e7b3244e453d5edffdc488a55ed58f6d486 /src/main.cpp
parenteb2b9c4c9cfacd6ec5aae8dae27f0a9389a9205d (diff)
downloadmana-client-2ff5ba5d01d79c0c3781ab160b023a62b14d26e6.tar.gz
mana-client-2ff5ba5d01d79c0c3781ab160b023a62b14d26e6.tar.bz2
mana-client-2ff5ba5d01d79c0c3781ab160b023a62b14d26e6.tar.xz
mana-client-2ff5ba5d01d79c0c3781ab160b023a62b14d26e6.zip
Fix order of function calls when loading data
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp
index e63d5956..306514e4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -482,6 +482,8 @@ void exit_engine()
// Shutdown sound
sound.close();
+ Being::cleanup();
+
// Unload XML databases
ColorDB::unload();
EmoteDB::unload();
@@ -945,8 +947,8 @@ int main(int argc, char *argv[])
ItemDB::load();
MonsterDB::load();
NPCDB::load();
- Being::load(); // Hairstyles and emotions
EmoteDB::load();
+ Being::load(); // Hairstyles and emotions
state = CHAR_CONNECT_STATE;
break;
@@ -1117,8 +1119,6 @@ int main(int argc, char *argv[])
delete setup;
delete setupWindow;
- Being::cleanup();
-
delete network;
SDLNet_Quit();