Load the databases at the start of the LOGIN state, after the updates are

loaded.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index fb03f6c1..e4406f9c 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -34,11 +34,15 @@ namespace
 {

     MonsterDB::MonsterInfos mMonsterInfos;

     MonsterInfo mUnknown;

+    bool mLoaded = false;

 }

 

 void

 MonsterDB::load()

 {

+    if (mLoaded)

+        return;

+

     mUnknown.setSprite("error.xml");

     mUnknown.setName("unnamed");

 

@@ -123,6 +127,8 @@ MonsterDB::load()
         }

         mMonsterInfos[XML::getProperty(monsterNode, "id", 0)] = currentInfo;

     }

+

+    mLoaded = true;

 }

 

 void

@@ -131,6 +137,8 @@ MonsterDB::unload()
     for_each (  mMonsterInfos.begin(), mMonsterInfos.end(),

                 make_dtor(mMonsterInfos));

     mMonsterInfos.clear();

+

+    mLoaded = false;

 }