games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-05-22 09:55:17 +02:00
Code Issues Releases Activity

Fix string ID's road/river/terrains

Browse Source
This commit is contained in:
Ivan Savenko
2023-02-13 00:07:28 +02:00
parent acdb8d6e06
commit 190368e419
6 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/TerrainHandler.cpp
+8 -7
View File
@@ -22,12 +22,8 @@ TerrainType * TerrainTypeHandler::loadFromJson( const std::string & scope, const
TerrainType * info = new TerrainType;
info->id = TerrainId(index);
if (identifier.find(':') == std::string::npos)
info->identifier = scope + ":" + identifier;
else
info->identifier = identifier;
info->identifier = identifier;
info->modScope = scope;
info->moveCost = static_cast<int>(json["moveCost"].Integer());
info->musicFilename = json["music"].String();
info->tilesFilename = json["tiles"].String();
@@ -177,9 +173,14 @@ bool TerrainType::isTransitionRequired() const
return transitionRequired;
}
std::string TerrainType::getJsonKey() const
{
return modScope + ":" + identifier;
}
std::string TerrainType::getNameTextID() const
{
return TextIdentifier( "terrain", identifier, "name" ).get();
return TextIdentifier( "terrain", modScope, identifier, "name" ).get();
}
std::string TerrainType::getNameTranslated() const