summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2006-12-23 18:01:01 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2006-12-23 18:01:01 +0000
commit1e6f5283eceff138873ec54159ad8f716ed39b45 (patch)
tree94b13a2ffa13a8980af177f38dd82a0b8d778d8b /src/main.cpp
parente50461677bf9f456cb912f5d318a769c3f4724ea (diff)
downloadmana-1e6f5283eceff138873ec54159ad8f716ed39b45.tar.gz
mana-1e6f5283eceff138873ec54159ad8f716ed39b45.tar.bz2
mana-1e6f5283eceff138873ec54159ad8f716ed39b45.tar.xz
mana-1e6f5283eceff138873ec54159ad8f716ed39b45.zip
Load the databases at the start of the LOGIN state, after the updates are
loaded.
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp
index f54b0792..1a171d84 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -286,11 +286,6 @@ void init_engine(const Options &options)
errorMessage = err;
logger->log("Warning: %s", err);
}
-
- // Load XML databases
- EquipmentDB::load();
- ItemDB::load();
- MonsterDB::load();
}
/** Clear the engine */
@@ -625,6 +620,12 @@ int main(int argc, char *argv[])
switch (state) {
case LOGIN_STATE:
logger->log("State: LOGIN");
+
+ // Load XML databases
+ EquipmentDB::load();
+ ItemDB::load();
+ MonsterDB::load();
+
if (!loginData.password.empty()) {
state = ACCOUNT_STATE;
} else {