Merge remote branch '1.0/1.0'

Conflicts:
	data/graphics/CMakeLists.txt
	data/graphics/Makefile.am
	src/client.cpp

5 files changed, 5 insertions, 5 deletions

diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index 0041cee4..c35a5660 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -36,7 +36,7 @@ namespace
 void ColorDB::load()
 {
     if (mLoaded)
-        return;
+        unload();
 
     XML::Document *doc = new XML::Document("hair.xml");
     xmlNodePtr root = doc->rootNode();
diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp
index 117c0bab..fddab500 100644
--- a/src/resources/emotedb.cpp
+++ b/src/resources/emotedb.cpp
@@ -36,7 +36,7 @@ namespace
 void EmoteDB::load()
 {
     if (mLoaded)
-        return;
+        unload();
 
     mLastEmote = 0;
 
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 57df6143..205268e5 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -109,7 +109,7 @@ static std::string normalized(const std::string &name)
 void ItemDB::load()
 {
     if (mLoaded)
-        return;
+        unload();
 
     logger->log("Initializing item database...");
 
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index da89302d..0732bb19 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -42,7 +42,7 @@ namespace
 void MonsterDB::load()
 {
     if (mLoaded)
-        return;
+        unload();
 
     logger->log("Initializing monster database...");
 
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index 03581e13..4f0ee10d 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.cpp
@@ -37,7 +37,7 @@ namespace
 void NPCDB::load()
 {
     if (mLoaded)
-        return;
+        unload();
 
     logger->log("Initializing NPC database...");