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

Added loading of reserved heroes from H3M

Browse Source
This commit is contained in:
Ivan Savenko
2023-06-25 17:47:45 +03:00
parent 2b7e554807
commit 2882e2d248
4 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/mapping/MapFormatH3M.cpp
View File

@@ -668,11 +668,15 @@ void CMapLoaderH3M::readAllowedHeroes()
else
reader->readBitmaskHeroes(mapHeader->allowedHeroes, false);
//TODO: unknown value. Check meaning? Only present in campaign maps.
if(features.levelAB)
{
uint32_t placeholdersQty = reader->readUInt32();
reader->skipUnused(placeholdersQty * 1);
for (uint32_t i = 0; i < placeholdersQty; ++i)
{
auto heroID = reader->readHero();
mapHeader->reservedCampaignHeroes.push_back(heroID);
}
}
}
@@ -861,6 +865,8 @@ void CMapLoaderH3M::readPredefinedHeroes()
}
}
map->predefinedHeroes.emplace_back(hero);
logGlobal->debug("Map '%s': Hero predefined in map: %s", mapName, VLC->heroh->getByIndex(hero->subID)->getJsonKey());
}
}
@@ -1288,12 +1294,12 @@ CGObjectInstance * CMapLoaderH3M::readHeroPlaceholder(const int3 & mapPosition)
if(htid.getNum() == -1)
{
object->power = reader->readUInt8();
logGlobal->debug("Hero placeholder: by power at %s", mapPosition.toString());
logGlobal->debug("Map '%s': Hero placeholder: by power at %s, owned by %s", mapName, mapPosition.toString(), object->getOwner().getStr());
}
else
{
object->power = 0;
logGlobal->debug("Hero placeholder: %s at %s", VLC->heroh->getById(htid)->getNameTranslated(), mapPosition.toString());
logGlobal->debug("Map '%s': Hero placeholder: %s at %s, owned by %s", mapName, VLC->heroh->getById(htid)->getJsonKey(), mapPosition.toString(), object->getOwner().getStr());
}
return object;
@@ -1765,6 +1771,12 @@ CGObjectInstance * CMapLoaderH3M::readHero(const int3 & mapPosition, const Objec
}
}
}
if (object->subID != -1)
logGlobal->debug("Map '%s': Hero on map: %s at %s, owned by %s", mapName, VLC->heroh->getByIndex(object->subID)->getJsonKey(), mapPosition.toString(), object->getOwner().getStr());
else
logGlobal->debug("Map '%s': Hero on map: (random) at %s, owned by %s", mapName, mapPosition.toString(), object->getOwner().getStr());
reader->skipZero(16);
return object;
}