summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-06-30 22:43:38 +0300
committerAndrei Karas <akaras@inbox.ru>2018-06-30 22:43:38 +0300
commit2b62aea7eaa69010c00476ccd7e03729ccac6226 (patch)
treed479bbfa52f344df12da471b534343f402f62a9d /src/resources
parent14bdb1d3ef3f337b34e68d054bee4a8bdd8bbc13 (diff)
downloadplus-2b62aea7eaa69010c00476ccd7e03729ccac6226.tar.gz
plus-2b62aea7eaa69010c00476ccd7e03729ccac6226.tar.bz2
plus-2b62aea7eaa69010c00476ccd7e03729ccac6226.tar.xz
plus-2b62aea7eaa69010c00476ccd7e03729ccac6226.zip
Rename "other" gender into "hidden" gender.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/db/itemdb.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index c91d74ffd..d6889bd83 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -173,7 +173,7 @@ void ItemDB::load()
std::string errFile = paths.getStringValue("spriteErrorFile");
mUnknown->setSprite(errFile, Gender::MALE, 0);
mUnknown->setSprite(errFile, Gender::FEMALE, 0);
- mUnknown->setSprite(errFile, Gender::OTHER, 0);
+ mUnknown->setSprite(errFile, Gender::HIDDEN, 0);
mUnknown->addTag(mTags["All"]);
loadXmlFile(paths.getStringValue("itemsFile"),
tagNum,
@@ -975,8 +975,9 @@ static void loadSpriteRef(ItemInfo *const itemInfo, XmlNodeConstPtr node)
itemInfo->setSprite(filename, Gender::MALE, race);
if (gender == "female" || gender == "unisex")
itemInfo->setSprite(filename, Gender::FEMALE, race);
- if (gender == "other" || gender == "unisex")
- itemInfo->setSprite(filename, Gender::OTHER, race);
+ // "other" is legacy from 20180630
+ if (gender == "hidden" || gender == "other" || gender == "unisex")
+ itemInfo->setSprite(filename, Gender::HIDDEN, race);
}
static void loadSoundRef(ItemInfo *const itemInfo, XmlNodeConstPtr node)