games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

- fixed crash on missing icons

Browse Source 
- proper ID resolution for secondary skills to avoid #1258
This commit is contained in:
Ivan Savenko
2013-04-23 09:16:20 +00:00
parent c9bbf7dfd5
commit e71bace8e3
3 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/CHeroHandler.cpp
View File

@@ -272,11 +272,21 @@ void CHeroHandler::loadHeroSkills(CHero * hero, const JsonNode & node)
{
BOOST_FOREACH(const JsonNode &set, node["skills"].Vector())
{
SecondarySkill skillID = SecondarySkill(
boost::range::find(NSecondarySkill::names, set["skill"].String()) - boost::begin(NSecondarySkill::names));
int skillLevel = boost::range::find(NSecondarySkill::levels, set["level"].String()) - boost::begin(NSecondarySkill::levels);
if (skillLevel < SecSkillLevel::LEVELS_SIZE)
{
size_t currentIndex = hero->secSkillsInit.size();
hero->secSkillsInit.push_back(std::make_pair(-1, skillLevel));
hero->secSkillsInit.push_back(std::make_pair(skillID, skillLevel));
VLC->modh->identifiers.requestIdentifier("skill." + set["skill"].String(), [=](si32 id)
{
hero->secSkillsInit[currentIndex].first = SecondarySkill(id);
});
}
else
{
logGlobal->errorStream() << "Unknown skill level: " <<set["level"].String();
}
}
// spellbook is considered present if hero have "spellbook" entry even when this is an empty set (0 spells)