1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00

Finished conversion to new logging API

* removed logger streams
* (float3|int3)::operator() -> (float3|int3)::toString(), it was too ugly and confusing.
This commit is contained in:
AlexVinS
2017-08-11 20:03:05 +03:00
parent f2de6d1122
commit 15138c23de
85 changed files with 543 additions and 669 deletions

View File

@@ -47,7 +47,7 @@ MacroString::MacroString(const std::string & format)
if(end_pos == std::string::npos)
{
logBonus->warnStream() << "Format error in: " << format;
logBonus->warn("Format error in: %s", format);
end_pos = start_pos;
break;
}
@@ -154,7 +154,7 @@ std::string CBonusTypeHandler::bonusToString(const std::shared_ptr<Bonus> & bonu
}
else
{
logBonus->warnStream() << "Unknown macro in bonus config: " << name;
logBonus->warn("Unknown macro in bonus config: %s", name);
return "[error]";
}
};
@@ -300,14 +300,14 @@ void CBonusTypeHandler::load(const JsonNode & config)
//
// bonusTypes.push_back(bt);
logBonus->warnStream() << "Adding new bonuses not implemented (" << node.first << ")";
logBonus->warn("Adding new bonuses not implemented (%s)", node.first);
}
else
{
CBonusType & bt = bonusTypes[it->second];
loadItem(node.second, bt);
logBonus->traceStream() << "Loaded bonus type " << node.first;
logBonus->trace("Loaded bonus type %s", node.first);
}
}
}