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

Rename toJson to toString/toCompactString for consistency

Browse Source
This commit is contained in:
Ivan Savenko
2024-02-12 01:22:16 +02:00
parent a2b8eaf7fb
commit 54796c7c56
22 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/json/JsonBonus.cpp
View File

@ -553,7 +553,7 @@ std::shared_ptr<Bonus> JsonUtils::parseBonus(const JsonNode &ability)
if (!parseBonus(ability, b.get()))
{
// caller code can not handle this case and presumes that returned bonus is always valid
logGlobal->error("Failed to parse bonus! Json config was %S ", ability.toJson());
logGlobal->error("Failed to parse bonus! Json config was %S ", ability.toString());
b->type = BonusType::NONE;
return b;
}
@ -577,7 +577,7 @@ static BonusParams convertDeprecatedBonus(const JsonNode &ability)
{
if(vstd::contains(deprecatedBonusSet, ability["type"].String()))
{
logMod->warn("There is deprecated bonus found:\n%s\nTrying to convert...", ability.toJson());
logMod->warn("There is deprecated bonus found:\n%s\nTrying to convert...", ability.toString());
auto params = BonusParams(ability["type"].String(),
ability["subtype"].isString() ? ability["subtype"].String() : "",
ability["subtype"].isNumber() ? ability["subtype"].Integer() : -1);
@ -589,11 +589,11 @@ static BonusParams convertDeprecatedBonus(const JsonNode &ability)
params.targetType = BonusSource::SECONDARY_SKILL;
}
logMod->warn("Please, use this bonus:\n%s\nConverted successfully!", params.toJson().toJson());
logMod->warn("Please, use this bonus:\n%s\nConverted successfully!", params.toJson().toString());
return params;
}
else
logMod->error("Cannot convert bonus!\n%s", ability.toJson());
logMod->error("Cannot convert bonus!\n%s", ability.toString());
}
BonusParams ret;
ret.isConverted = false;