1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-21 00:19:29 +02:00

* campaign against magic numbers

* ArtifactID was misleading and wrongly used in one place -- renamed and fixed
* minor changes
This commit is contained in:
mateuszb
2012-09-23 18:01:04 +00:00
parent 3fcba4fb5c
commit 6a81c8b1af
32 changed files with 567 additions and 511 deletions

View File

@ -44,7 +44,7 @@ int CHeroClass::chooseSecSkill(const std::set<int> & possibles) const //picks se
throw std::runtime_error("Cannot pick secondary skill!");
}
EAlignment::EAlignment CHeroClass::getAlignment()
EAlignment::EAlignment CHeroClass::getAlignment() const
{
return (EAlignment::EAlignment)alignment;
}
@ -240,10 +240,10 @@ void CHeroHandler::loadHeroClasses()
hc->name = parser.readString();
hc->aggression = parser.readNumber();
hc->initialAttack = parser.readNumber();
hc->initialDefence = parser.readNumber();
hc->initialPower = parser.readNumber();
hc->initialKnowledge = parser.readNumber();
for(int g=0; g<GameConstants::PRIMARY_SKILLS; ++g)
{
hc->initialPrimSkills[g] = parser.readNumber();
}
hc->primChance.resize(GameConstants::PRIMARY_SKILLS);
for(int x=0; x<GameConstants::PRIMARY_SKILLS; ++x)