games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Docs & final touches

Browse Source
This commit is contained in:
Tomasz Zieliński
2024-04-12 14:53:07 +02:00
parent be9813b4fb
commit a7d0f0626a
6 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/mapObjects/ObstacleSetHandler.cpp
View File

@@ -13,6 +13,7 @@
#include "../modding/IdentifierStorage.h"
#include "../constants/StringConstants.h"
#include "../TerrainHandler.h"
VCMI_LIB_NAMESPACE_BEGIN
@@ -303,7 +304,7 @@ std::shared_ptr<ObstacleSet> ObstacleSetHandler::loadFromJson(const std::string
os->setTerrain(TerrainId(id));
});
}
else // Other cases won't pass validation
else if (biome["terrain"].isVector())
{
auto terrains = biome["terrain"].Vector();
@@ -315,8 +316,12 @@ std::shared_ptr<ObstacleSet> ObstacleSetHandler::loadFromJson(const std::string
});
}
}
else
{
logMod->error("No terrain specified for obstacle set %s", name);
}
auto parseFaction = [os, scope](const std::string & str) -> FactionID
auto handleFaction = [os, scope](const std::string & str)
{
VLC->identifiers()->requestIdentifier(scope, "faction", str, [os](si32 id)
{
@@ -327,14 +332,14 @@ std::shared_ptr<ObstacleSet> ObstacleSetHandler::loadFromJson(const std::string
if (biome["faction"].isString())
{
auto factionName = biome["faction"].String();
parseFaction(factionName);
handleFaction(factionName);
}
else if (biome["faction"].isVector())
{
auto factions = biome["faction"].Vector();
for (const auto & node : factions)
{
parseFaction(node.String());
handleFaction(node.String());
}
}