diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-06-02 21:09:14 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-06-02 21:09:14 +0300 |
| commit | 670264d93a362a3b987c6da62511ac49cd07b048 (patch) | |
| tree | 8e7470b6f419965a4fe4464fe06dd9c117edce5a /src/resources/db/mercenarydb.cpp | |
| parent | 6e577446c8b561a4ce8fd2d74f43c36210e8a571 (diff) | |
| download | manaplus-670264d93a362a3b987c6da62511ac49cd07b048.tar.gz manaplus-670264d93a362a3b987c6da62511ac49cd07b048.tar.bz2 manaplus-670264d93a362a3b987c6da62511ac49cd07b048.tar.xz manaplus-670264d93a362a3b987c6da62511ac49cd07b048.zip | |
Show asserts for most errors in resource dbs.
Diffstat (limited to 'src/resources/db/mercenarydb.cpp')
| -rw-r--r-- | src/resources/db/mercenarydb.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/resources/db/mercenarydb.cpp b/src/resources/db/mercenarydb.cpp index 60fe94504..4fbc7e36c 100644 --- a/src/resources/db/mercenarydb.cpp +++ b/src/resources/db/mercenarydb.cpp @@ -27,6 +27,7 @@ #include "resources/beingcommon.h" #include "resources/beinginfo.h" +#include "utils/checkutils.h" #include "utils/dtor.h" #include "configuration.h" @@ -62,7 +63,7 @@ void MercenaryDB::loadXmlFile(const std::string &fileName, if (!rootNode || !xmlNameEqual(rootNode, "mercenaries")) { - logger->log("Monster Database: Error while loading %s!", + logger->log("MercenaryDB: Error while loading %s!", paths.getStringValue("mercenariesFile").c_str()); mLoaded = true; return; @@ -141,7 +142,7 @@ BeingInfo *MercenaryDB::get(const BeingTypeId id) i = mMercenaryInfos.find(id); if (i == mMercenaryInfos.end()) { - logger->log("MercenaryDB: Warning, unknown mercenary ID " + reportAlways("MercenaryDB: Warning, unknown mercenary ID " "%d requested", toInt(id, int)); return BeingInfo::unknown; |