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

Merge branch 'master' into 'develop'

Browse Source
This commit is contained in:
Ivan Savenko
2024-01-25 16:23:13 +02:00
parent 88e54685b3 3d2f69199a
commit 2a193effcc
26 changed files with 152 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/mapObjectConstructors/DwellingInstanceConstructor.cpp
View File

@ -35,17 +35,17 @@ void DwellingInstanceConstructor::initTypeData(const JsonNode & input)
const auto totalLevels = levels.size();
availableCreatures.resize(totalLevels);
for(auto currentLevel = 0; currentLevel < totalLevels; currentLevel++)
for(int currentLevel = 0; currentLevel < totalLevels; currentLevel++)
{
const JsonVector & creaturesOnLevel = levels[currentLevel].Vector();
const auto creaturesNumber = creaturesOnLevel.size();
availableCreatures[currentLevel].resize(creaturesNumber);
for(auto currentCreature = 0; currentCreature < creaturesNumber; currentCreature++)
for(int currentCreature = 0; currentCreature < creaturesNumber; currentCreature++)
{
VLC->identifiers()->requestIdentifier("creature", creaturesOnLevel[currentCreature], [=] (si32 index)
VLC->identifiers()->requestIdentifier("creature", creaturesOnLevel[currentCreature], [this, currentLevel, currentCreature] (si32 index)
{
availableCreatures[currentLevel][currentCreature] = CreatureID(index).toCreature();
availableCreatures.at(currentLevel).at(currentCreature) = CreatureID(index).toCreature();
});
}
assert(!availableCreatures[currentLevel].empty());