From 670264d93a362a3b987c6da62511ac49cd07b048 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 2 Jun 2016 21:09:14 +0300
Subject: Show asserts for most errors in resource dbs.

---
 src/resources/db/mercenarydb.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/resources/db/mercenarydb.cpp')

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;
-- 
cgit v1.2.3-60-g2f50