games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-17 00:07:41 +02:00
Code Issues Releases Activity

Map/Road/River identifiers are now private members

Browse Source
This commit is contained in:
Ivan Savenko
2023-01-01 17:10:47 +02:00
parent f3985d205b
commit 7c7ae26e67
31 changed files with 92 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/rmg/CRmgTemplate.cpp
View File

@ -75,7 +75,7 @@ public:
static std::string encode(const si32 index)
{
return VLC->terrainTypeHandler->getByIndex(index)->identifier;
return VLC->terrainTypeHandler->getByIndex(index)->getName();
}
};
@ -154,7 +154,7 @@ ZoneOptions::ZoneOptions()
{
for(const auto & terr : VLC->terrainTypeHandler->objects)
if(terr->isLand() && terr->isPassable())
terrainTypes.insert(terr->id);
terrainTypes.insert(terr->getId());
}
ZoneOptions & ZoneOptions::operator=(const ZoneOptions & other)
@ -365,7 +365,7 @@ void ZoneOptions::serializeJson(JsonSerializeFormat & handler)
for(auto & ttype : terrainTypes)
{
JsonNode n;
n.String() = VLC->terrainTypeHandler->getById(ttype)->identifier;
n.String() = VLC->terrainTypeHandler->getById(ttype)->getName();
node.Vector().push_back(n);
}
}