1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00

Merge remote-tracking branch 'origin/develop' into ban_stuff_on_water_maps

This commit is contained in:
Tomasz Zieliński
2023-07-15 14:36:32 +02:00
166 changed files with 3016 additions and 1559 deletions

View File

@ -114,7 +114,7 @@ void CMapGenerator::initQuestArtsRemaining()
for (auto art : VLC->arth->objects)
{
//Don't use parts of combined artifacts
if (art->aClass == CArtifact::ART_TREASURE && VLC->arth->legalArtifact(art->getId()) && art->constituentOf.empty())
if (art->aClass == CArtifact::ART_TREASURE && VLC->arth->legalArtifact(art->getId()) && art->getPartOf().empty())
questArtifacts.push_back(art->getId());
}
}