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

Fix loading of buildings of random town

Browse Source
This commit is contained in:
Ivan Savenko
2023-05-23 16:13:09 +03:00
parent ffd7144df8
commit 5fe5d0c045
5 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/mapping/MapIdentifiersH3M.cpp
View File

@@ -43,11 +43,11 @@ void MapIdentifiersH3M::loadMapping(const JsonNode & mapping)
}
}
BuildingID MapIdentifiersH3M::remapBuilding(FactionID owner, BuildingID input) const
BuildingID MapIdentifiersH3M::remapBuilding(std::optional<FactionID> owner, BuildingID input) const
{
if (mappingFactionBuilding.count(owner))
if (owner.has_value() && mappingFactionBuilding.count(*owner))
{
auto submap = mappingFactionBuilding.at(owner);
auto submap = mappingFactionBuilding.at(*owner);
if (submap.count(input))
return submap.at(input);
@@ -55,16 +55,7 @@ BuildingID MapIdentifiersH3M::remapBuilding(FactionID owner, BuildingID input) c
if (mappingBuilding.count(input))
return mappingBuilding.at(input);
logGlobal->warn("Not mapped building ID %d found for faction %d!", input, owner);
return input;
}
BuildingID MapIdentifiersH3M::remapBuilding(BuildingID input) const
{
if (mappingBuilding.count(input))
return mappingBuilding.at(input);
logGlobal->warn("Not mapped building ID %d found!");
return input;
return BuildingID::NONE;
}
VCMI_LIB_NAMESPACE_END