games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-21 00:19:29 +02:00
Code Issues Releases Activity

Fix parsing of hota 1.7.3 maps/campaigns

Browse Source
This commit is contained in:
Ivan Savenko
2025-06-09 21:40:11 +03:00
parent 43844e2371
commit 5ccb32aa4e
4 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/mapping/MapFormatH3M.cpp
View File

@ -168,6 +168,14 @@ void CMapLoaderH3M::readHeader()
features = MapFormatFeaturesH3M::find(mapHeader->version, hotaVersion);
reader->setFormatLevel(features);
if(features.levelHOTA8)
{
int hotaVersionMajor = reader->readUInt32();
int hotaVersionMinor = reader->readUInt32();
int hotaVersionPatch = reader->readUInt32();
logGlobal->trace("Loading HotA map, version %d.%d.%d", hotaVersionMajor, hotaVersionMinor, hotaVersionPatch);
}
if(features.levelHOTA1)
{
bool isMirrorMap = reader->readBool();
@ -211,6 +219,13 @@ void CMapLoaderH3M::readHeader()
if (!canHireDefeatedHeroes)
logGlobal->warn("Map '%s': Option to block hiring of defeated heroes is not implemented!", mapName);
}
if(features.levelHOTA8)
{
bool forceMatchingVersion = reader->readBool();
if (forceMatchingVersion)
logGlobal->warn("Map '%s': This map is forced to use specific hota version!", mapName);
}
}
else
{
@ -2401,7 +2416,8 @@ EQuestMission CMapLoaderH3M::readQuest(IQuestObject * guard, const int3 & positi
case EQuestMission::KILL_HERO:
case EQuestMission::KILL_CREATURE:
{
assert(questsToResolve.count(guard) == 0);
// NOTE: assert might fail on multi-quest seers
//assert(questsToResolve.count(guard) == 0);
questsToResolve[guard] = reader->readUInt32();
break;
}