summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/colordb.cpp2
-rw-r--r--src/resources/emotedb.cpp2
-rw-r--r--src/resources/itemdb.cpp2
-rw-r--r--src/resources/monsterdb.cpp2
-rw-r--r--src/resources/npcdb.cpp2
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 4638f00e..077012c7 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -108,7 +108,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 e9afa7ef..5a796f5f 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -43,7 +43,7 @@ namespace
void MonsterDB::load()
{
if (mLoaded)
- return;
+ unload();
mUnknown.addSprite("error.xml");
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index 4bc5a6e4..bc36a3b4 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.cpp
@@ -35,7 +35,7 @@ namespace
void NPCDB::load()
{
if (mLoaded)
- return;
+ unload();
NPCsprite *unknownSprite = new NPCsprite;
unknownSprite->sprite = "error.xml";