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

Merge remote-tracking branch 'origin/beta' into random_prison_distributor

Browse Source
This commit is contained in:
Tomasz Zieliński
2024-01-14 21:56:49 +01:00
parent 3e623565a2 19765e0e01
commit ee6c331bad
9 changed files with 62 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/rmg/CMapGenerator.cpp
View File

@ -480,14 +480,26 @@ const std::vector<HeroTypeID> CMapGenerator::getAllPossibleHeroes() const
for (HeroTypeID hero : map->getMap(this).allowedHeroes)
{
auto * h = dynamic_cast<const CHero*>(VLC->heroTypes()->getById(hero));
if ((h->onlyOnWaterMap && !isWaterMap) || (h->onlyOnMapWithoutWater && isWaterMap))
{
if(h->onlyOnWaterMap && !isWaterMap)
continue;
}
else
if(h->onlyOnMapWithoutWater && isWaterMap)
continue;
bool heroUsedAsStarting = false;
for (auto const & player : map->getMapGenOptions().getPlayersSettings())
{
ret.push_back(hero);
if (player.second.getStartingHero() == hero)
{
heroUsedAsStarting = true;
break;
}
}
if (heroUsedAsStarting)
continue;
ret.push_back(hero);
}
return ret;
}