games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

Merge pull request #2230 from vcmi/fix_seer_huts

Browse Source 
Fix crash which could occur if we can't add any Seer Hut to RMG pool
This commit is contained in:
DjWarmonger 2023-06-15 09:50:00 +02:00 committed by GitHub
commit 79a1041648
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/rmg/modificators/TreasurePlacer.cpp
View File

@ -406,6 +406,10 @@ void TreasurePlacer::addAllPossibleObjects()
}
const int questArtsRemaining = qap->getMaxQuestArtifactCount();
if (!questArtsRemaining)
{
return;
}
//Generate Seer Hut one by one. Duplicated oi possible and should work fine.
oi.maxPerZone = 1;
@ -520,6 +524,10 @@ void TreasurePlacer::addAllPossibleObjects()
possibleSeerHuts.push_back(oi);
}
if (possibleSeerHuts.empty())
{
return;
}
for (size_t i = 0; i < questArtsRemaining; i++)
{
addObjectToRandomPool(*RandomGeneratorUtil::nextItem(possibleSeerHuts, zone.getRand()));