From 2ff5ba5d01d79c0c3781ab160b023a62b14d26e6 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Wed, 11 Mar 2009 13:37:16 -0600
Subject: Fix order of function calls when loading data

---
 src/main.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

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();
 
-- 
cgit v1.2.3-60-g2f50