summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-09-27 02:05:28 +0300
committerAndrei Karas <akaras@inbox.ru>2016-09-27 02:05:28 +0300
commit6dd07b6697176da72ac8607897fca320d77142fd (patch)
treed9e1fea274e34f61568975a2026ad8cdc542d596 /src/resources
parent0bf480113790977c33713b328b1754426af55fdc (diff)
downloadmanaplus-6dd07b6697176da72ac8607897fca320d77142fd.tar.gz
manaplus-6dd07b6697176da72ac8607897fca320d77142fd.tar.bz2
manaplus-6dd07b6697176da72ac8607897fca320d77142fd.tar.xz
manaplus-6dd07b6697176da72ac8607897fca320d77142fd.zip
Add support for links to mercenaries.
Format is: @@MID|@@ Example: [@@M1191|@@]
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/db/mercenarydb.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/resources/db/mercenarydb.cpp b/src/resources/db/mercenarydb.cpp
index 9e7ccf511..4b12e96ff 100644
--- a/src/resources/db/mercenarydb.cpp
+++ b/src/resources/db/mercenarydb.cpp
@@ -27,6 +27,7 @@
#include "utils/checkutils.h"
#include "utils/dtor.h"
+#include "utils/gettext.h"
#include "configuration.h"
@@ -95,6 +96,9 @@ void MercenaryDB::loadXmlFile(const std::string &fileName,
currentInfo = new BeingInfo;
currentInfo->setBlockType(BlockType::NONE);
+ currentInfo->setName(XML::langProperty(
+ // TRANSLATORS: unknown info name
+ mercenaryNode, "name", _("unnamed")));
BeingCommon::readBasicAttributes(currentInfo, mercenaryNode, "attack");
BeingCommon::readWalkingAttributes(currentInfo, mercenaryNode, 0);
BeingCommon::readAiAttributes(currentInfo, mercenaryNode);