From bc94e3dbe141ca257363850077d3faf48338fb87 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 18 Jun 2016 22:03:20 +0300 Subject: Fix asserts about not found translated item names. --- src/resources/db/itemdb.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/resources/db/itemdb.cpp') diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp index d79f75933..be196f615 100644 --- a/src/resources/db/itemdb.cpp +++ b/src/resources/db/itemdb.cpp @@ -301,6 +301,7 @@ void ItemDB::loadXmlFile(const std::string &fileName, const int inherit = XML::getProperty(node, "inherit", -1); std::string name = XML::langProperty(node, "name", ""); + std::string nameEn = XML::getProperty(node, "name", ""); std::string image = XML::getProperty(node, "image", ""); std::string floor = XML::getProperty(node, "floor", ""); std::string description = XML::langProperty(node, "description", ""); @@ -383,6 +384,11 @@ void ItemDB::loadXmlFile(const std::string &fileName, name = inheritItemInfo->getName(); // TRANSLATORS: item info name itemInfo->setName(name.empty() ? _("unnamed") : name); + if (nameEn.empty()) + itemInfo->setNameEn(name.empty() ? _("unnamed") : name); + else + itemInfo->setNameEn(nameEn); + if (description.empty() && inheritItemInfo) description = inheritItemInfo->getDescription(); itemInfo->setDescription(description); @@ -606,6 +612,11 @@ void ItemDB::loadXmlFile(const std::string &fileName, temp = normalize(name); mNamedItemInfos[temp] = itemInfo; } + if (!nameEn.empty()) + { + temp = normalize(nameEn); + mNamedItemInfos[temp] = itemInfo; + } if (!attackAction.empty()) { -- cgit v1.2.3-60-g2f50