games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-08 22:26:51 +02:00
Code Issues Releases Activity

Merge pull request #5407 from IvanSavenko/cove_fix

Browse Source 
[1.6.6] Fix loading of HotA maps with Cove town placed on map
This commit is contained in:
Ivan Savenko
2025-02-10 14:52:44 +02:00
committed by GitHub
parent f91973e544 1917fae2c0
commit 3e87d9e5fa
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/mapping/MapIdentifiersH3M.cpp
View File

@@ -116,6 +116,15 @@ void MapIdentifiersH3M::remapTemplate(ObjectTemplate & objectTemplate)
objectTemplate.subid = mappedType.subID; objectTemplate.subid = mappedType.subID;
} }
if (objectTemplate.id == Obj::TOWN || objectTemplate.id == Obj::RANDOM_DWELLING_FACTION)
objectTemplate.subid = remap(FactionID(objectTemplate.subid));
if (objectTemplate.id == Obj::MONSTER)
objectTemplate.subid = remap(CreatureID(objectTemplate.subid));
if (objectTemplate.id == Obj::ARTIFACT)
objectTemplate.subid = remap(ArtifactID(objectTemplate.subid));
if (VLC->objtypeh->knownObjects().count(objectTemplate.id) == 0) if (VLC->objtypeh->knownObjects().count(objectTemplate.id) == 0)
{ {
logGlobal->warn("Unknown object found: %d | %d", objectTemplate.id, objectTemplate.subid); logGlobal->warn("Unknown object found: %d | %d", objectTemplate.id, objectTemplate.subid);
@@ -131,15 +140,6 @@ void MapIdentifiersH3M::remapTemplate(ObjectTemplate & objectTemplate)
objectTemplate.subid = {}; objectTemplate.subid = {};
} }
} }
if (objectTemplate.id == Obj::TOWN || objectTemplate.id == Obj::RANDOM_DWELLING_FACTION)
objectTemplate.subid = remap(FactionID(objectTemplate.subid));
if (objectTemplate.id == Obj::MONSTER)
objectTemplate.subid = remap(CreatureID(objectTemplate.subid));
if (objectTemplate.id == Obj::ARTIFACT)
objectTemplate.subid = remap(ArtifactID(objectTemplate.subid));
} }
BuildingID MapIdentifiersH3M::remapBuilding(std::optional<FactionID> owner, BuildingID input) const BuildingID MapIdentifiersH3M::remapBuilding(std::optional<FactionID> owner, BuildingID input) const