games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-09-16 09:26:28 +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

11
lib/mapping/CMapEditManager.cpp
View File

@@ -660,9 +660,6 @@ void CDrawTerrainOperation::updateTerrainTypes()
if (addToSuitableTiles)
{
suitableTiles.insert(posToTest);
//logGlobal->debugStream() << boost::format(std::string("Found suitable tile '%s' for main tile '%s': ") +
// "Invalid native tiles '%i', invalid foreign tiles '%i', centerPosValid '%i'") % posToTest % centerPos % testTile.nativeTiles.size() %
// testTile.foreignTiles.size() % testTile.centerPosValid;
}
terrainTile.terType = formerTerType;
@@ -720,8 +717,6 @@ void CDrawTerrainOperation::updateTerrainViews()
valRslt = validateTerrainView(pos, &pattern);
if(valRslt.result)
{
/*logGlobal->debugStream() << boost::format("Pattern detected at pos '%s': Pattern '%s', Flip '%i', Repl. '%s'.") %
pos % pattern.id % valRslt.flip % valRslt.transitionReplacement;*/
bestPattern = k;
break;
}
@@ -730,7 +725,7 @@ void CDrawTerrainOperation::updateTerrainViews()
if(bestPattern == -1)
{
// This shouldn't be the case
logGlobal->warn("No pattern detected at pos '%s'.", pos);
logGlobal->warn("No pattern detected at pos '%s'.", pos.toString());
CTerrainViewPatternUtils::printDebuggingInfoAboutTile(map, pos);
continue;
}
@@ -1033,7 +1028,7 @@ CDrawTerrainOperation::ValidationResult::ValidationResult(bool result, const std
void CTerrainViewPatternUtils::printDebuggingInfoAboutTile(const CMap * map, int3 pos)
{
logGlobal->debugStream() << "Printing detailed info about nearby map tiles of pos '" << pos << "'";
logGlobal->debug("Printing detailed info about nearby map tiles of pos '%s'", pos.toString());
for(int y = pos.y - 2; y <= pos.y + 2; ++y)
{
std::string line;
@@ -1056,7 +1051,7 @@ void CTerrainViewPatternUtils::printDebuggingInfoAboutTile(const CMap * map, int
}
}
logGlobal->debugStream() << line;
logGlobal->debug(line);
}
}