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

fixed formatting and other small issues

Browse Source
This commit is contained in:
Henning Koehler
2017-09-17 15:48:01 +12:00
parent 73f782aa39
commit f9a8cb2876
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/CHeroHandler.cpp
View File

@ -492,9 +492,9 @@ std::vector<std::shared_ptr<Bonus>> SpecialtyInfoToBonuses(const SSpecialtyInfo
//propagate for regular upgrades of base creature //propagate for regular upgrades of base creature
for(auto cre_id : creatures[spec.subtype]->upgrades) for(auto cre_id : creatures[spec.subtype]->upgrades)
{ {
bonus = std::make_shared<Bonus>(*bonus); std::shared_ptr<Bonus> upgradeUpgradedVersion = std::make_shared<Bonus>(*bonus);
bonus->subtype = cre_id; upgradeUpgradedVersion->subtype = cre_id;
result.push_back(bonus); result.push_back(upgradeUpgradedVersion);
} }
} }
break; break;
@ -613,10 +613,10 @@ void CHeroHandler::loadHeroSpecialty(CHero * hero, const JsonNode & node)
for(const JsonNode &specialty : specialtiesNode.Vector()) for(const JsonNode &specialty : specialtiesNode.Vector())
{ {
SSpecialtyInfo spec; SSpecialtyInfo spec;
spec.type = specialty["type"].Float(); spec.type = specialty["type"].Integer();
spec.val = specialty["val"].Float(); spec.val = specialty["val"].Integer();
spec.subtype = specialty["subtype"].Float(); spec.subtype = specialty["subtype"].Integer();
spec.additionalinfo = specialty["info"].Float(); spec.additionalinfo = specialty["info"].Integer();
//we convert after loading completes, to have all identifiers for json logging //we convert after loading completes, to have all identifiers for json logging
hero->specDeprecated.push_back(spec); hero->specDeprecated.push_back(spec);
} }

4
lib/HeroBonus.h
View File

@ -1034,7 +1034,7 @@ public:
virtual std::string toString() const; virtual std::string toString() const;
virtual JsonNode toJsonNode() const = 0; virtual JsonNode toJsonNode() const = 0;
template <typename Handler> void serialize(Handler &h, const int version) template <typename Handler> void serialize(Handler & h, const int version)
{ {
} }
}; };
@ -1048,7 +1048,7 @@ public:
ScalingUpdater(); ScalingUpdater();
ScalingUpdater(int valPer20, int stepSize = 1); ScalingUpdater(int valPer20, int stepSize = 1);
template <typename Handler> void serialize(Handler &h, const int version) template <typename Handler> void serialize(Handler & h, const int version)
{ {
h & static_cast<IUpdater &>(*this); h & static_cast<IUpdater &>(*this);
h & valPer20; h & valPer20;

2
lib/JsonNode.cpp
View File

@ -648,7 +648,7 @@ bool JsonUtils::parseBonus(const JsonNode &ability, Bonus *b)
b->propagator = parseByMap(bonusPropagatorMap, value, "propagator type "); b->propagator = parseByMap(bonusPropagatorMap, value, "propagator type ");
value = &ability["updater"]; value = &ability["updater"];
if (!value->isNull()) if(!value->isNull())
{ {
const JsonNode & updaterJson = *value; const JsonNode & updaterJson = *value;
if(updaterJson["type"].String() == "GROWS_WITH_LEVEL") if(updaterJson["type"].String() == "GROWS_WITH_LEVEL")

2
lib/mapObjects/CGHeroInstance.cpp
View File

@ -540,7 +540,7 @@ void CGHeroInstance::recreateSecondarySkillsBonuses()
updateSkill(SecondarySkill(skill_info.first), level); updateSkill(SecondarySkill(skill_info.first), level);
} }
void CGHeroInstance::recreateSpecialtyBonuses(std::vector<HeroSpecial*> & specialtyDeprecated) void CGHeroInstance::recreateSpecialtyBonuses(std::vector<HeroSpecial *> & specialtyDeprecated)
{ {
auto HeroSpecialToSpecialtyBonus = [](HeroSpecial & hs) -> SSpecialtyBonus auto HeroSpecialToSpecialtyBonus = [](HeroSpecial & hs) -> SSpecialtyBonus
{ {