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

Finished conversion to new logging API

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/mapping/MapFormatJson.cpp
View File

@@ -60,7 +60,7 @@ si32 MapObjectResolver::decode(const std::string & identifier) const
}
else
{
logGlobal->errorStream() << "Object not found: " << identifier;
logGlobal->error("Object not found: %s", identifier);
return -1;
}
}
@@ -82,7 +82,7 @@ std::string MapObjectResolver::encode(si32 identifier) const
si32 oid = id.getNum();
if(oid < 0 || oid >= owner->map->objects.size())
{
logGlobal->errorStream() << "Cannot get object with id " << oid;
logGlobal->error("Cannot get object with id %d", oid);
return "";
}
@@ -867,7 +867,7 @@ void CMapLoaderJson::readHeader(const bool complete)
if(fileVersionMajor != VERSION_MAJOR)
{
logGlobal->errorStream() << "Unsupported map format version: " << fileVersionMajor;
logGlobal->error("Unsupported map format version: %d", fileVersionMajor);
throw std::runtime_error("Unsupported map format version");
}
@@ -875,7 +875,7 @@ void CMapLoaderJson::readHeader(const bool complete)
if(fileVersionMinor > VERSION_MINOR)
{
logGlobal->warnStream() << "Too new map format revision: " << fileVersionMinor << ". This map should work but some of map features may be ignored.";
logGlobal->warn("Too new map format revision: %d. This map should work but some of map features may be ignored.", fileVersionMinor);
}
JsonDeserializer handler(mapObjectResolver.get(), header);