1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00

All h3m bitsets are now loaded inside mapReader

This commit is contained in:
Ivan Savenko
2023-05-23 22:41:21 +03:00
parent 5fe5d0c045
commit 8d0dcd6ad7
6 changed files with 119 additions and 69 deletions

View File

@@ -1403,7 +1403,7 @@ void CGWitchHut::initObj(CRandomGenerator & rand)
for(int i = 0; i < defaultAllowed.size(); i++)
if (defaultAllowed[i] && cb->isAllowed(2, i))
allowedAbilities.insert(i);
allowedAbilities.insert(SecondarySkill(i));
}
ability = *RandomGeneratorUtil::nextItem(allowedAbilities, rand);
}
@@ -1479,7 +1479,7 @@ void CGWitchHut::serializeJsonOptions(JsonSerializeFormat & handler)
allowedAbilities.clear();
for(si32 i = 0; i < skillCount; ++i)
if(temp[i])
allowedAbilities.insert(i);
allowedAbilities.insert(SecondarySkill(i));
}
}