games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity

Logging cleanup 3

Browse Source
This commit is contained in:
AlexVinS 2017-08-10 20:17:10 +03:00
parent 61e241308d
commit 85e952f25f
13 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
AI/VCAI/VCAI.cpp
View File

@ -2348,7 +2348,7 @@ Goals::TSubgoal VCAI::striveToGoalInternal(Goals::TSubgoal ultimateGoal, bool on
} }
catch(std::exception &e) catch(std::exception &e)
{ {
logAi->debugStream() << boost::format("Goal %s decomposition failed: %s") % goal->name() % e.what(); logAi->debug("Goal %s decomposition failed: %s", goal->name(), e.what());
return sptr(Goals::Invalid()); return sptr(Goals::Invalid());
} }
} }
@ -2380,7 +2380,7 @@ Goals::TSubgoal VCAI::striveToGoalInternal(Goals::TSubgoal ultimateGoal, bool on
} }
else else
{ {
logAi->debugStream() << boost::format("Trying to realize %s (value %2.3f)") % goal->name() % goal->priority; logAi->debug("Trying to realize %s (value %2.3f)", goal->name(), goal->priority);
goal->accept(this); goal->accept(this);
} }
@ -2401,7 +2401,7 @@ Goals::TSubgoal VCAI::striveToGoalInternal(Goals::TSubgoal ultimateGoal, bool on
} }
catch(std::exception &e) catch(std::exception &e)
{ {
logAi->debugStream() << boost::format("Failed to realize subgoal of type %s (greater goal type was %s), I will stop.") % goal->name() % ultimateGoal->name(); logAi->debug("Failed to realize subgoal of type %s (greater goal type was %s), I will stop.", goal->name(), ultimateGoal->name());
logAi->debug("The error message was: %s", e.what()); logAi->debug("The error message was: %s", e.what());
break; break;
} }
@ -2553,7 +2553,7 @@ void VCAI::performTypicalActions()
if(!h) //hero might be lost. getUnblockedHeroes() called once on start of turn if(!h) //hero might be lost. getUnblockedHeroes() called once on start of turn
continue; continue;
logAi->debugStream() << boost::format("Looking into %s, MP=%d") % h->name.c_str() % h->movement; logAi->debug("Looking into %s, MP=%d", h->name.c_str(), h->movement);
makePossibleUpgrades(*h); makePossibleUpgrades(*h);
pickBestArtifacts(*h); pickBestArtifacts(*h);
try try
@ -2771,7 +2771,7 @@ void VCAI::checkHeroArmy (HeroPtr h)
void VCAI::recruitHero(const CGTownInstance * t, bool throwing) void VCAI::recruitHero(const CGTownInstance * t, bool throwing)
{ {
logAi->debugStream() << boost::format("Trying to recruit a hero in %s at %s") % t->name % t->visitablePos(); logAi->debug("Trying to recruit a hero in %s at %s", t->name, t->visitablePos());
auto heroes = cb->getAvailableHeroes(t); auto heroes = cb->getAvailableHeroes(t);
if(heroes.size()) if(heroes.size())
@ -2824,7 +2824,7 @@ void VCAI::lostHero(HeroPtr h)
void VCAI::answerQuery(QueryID queryID, int selection) void VCAI::answerQuery(QueryID queryID, int selection)
{ {
logAi->debugStream() << boost::format("I'll answer the query %d giving the choice %d") % queryID % selection; logAi->debug("I'll answer the query %d giving the choice %d", queryID, selection);
if(queryID != QueryID(-1)) if(queryID != QueryID(-1))
{ {
cb->selectionMade(selection, queryID); cb->selectionMade(selection, queryID);

2
client/CMT.cpp
View File

@ -906,7 +906,7 @@ void processCommand(const std::string &message)
if(elem.second.human) if(elem.second.human)
{ {
auto AiToGive = client->aiNameForPlayer(*client->getPlayerSettings(elem.first), false); auto AiToGive = client->aiNameForPlayer(*client->getPlayerSettings(elem.first), false);
logNetwork->infoStream() << boost::format("Player %s will be lead by %s") % elem.first % AiToGive; logNetwork->info("Player %s will be lead by %s", elem.first, AiToGive);
client->installNewPlayerInterface(CDynLibHandler::getNewAI(AiToGive), elem.first); client->installNewPlayerInterface(CDynLibHandler::getNewAI(AiToGive), elem.first);
} }
} }

2
client/Graphics.cpp
View File

@ -364,7 +364,7 @@ std::shared_ptr<CAnimation> Graphics::getAnimation(const ObjectTemplate & info)
if(info.animationFile.empty()) if(info.animationFile.empty())
{ {
logGlobal->warnStream() << boost::format("Def name for obj (%d,%d) is empty!") % info.id % info.subid; logGlobal->warn("Def name for obj (%d,%d) is empty!", info.id, info.subid);
return std::shared_ptr<CAnimation>(); return std::shared_ptr<CAnimation>();
} }

3
client/widgets/CComponent.cpp
View File

@ -217,8 +217,7 @@ std::string CComponent::getSubtitleInternal()
auto building = CGI->townh->factions[subtype]->town->buildings[BuildingID(val)]; auto building = CGI->townh->factions[subtype]->town->buildings[BuildingID(val)];
if(!building) if(!building)
{ {
logGlobal->errorStream() << boost::format("Town of faction %s has no building #%d") logGlobal->error("Town of faction %s has no building #%d", CGI->townh->factions[subtype]->town->faction->name, val);
% CGI->townh->factions[subtype]->town->faction->name % val;
return (boost::format("Missing building #%d") % val).str(); return (boost::format("Missing building #%d") % val).str();
} }
return building->Name(); return building->Name();

2
lib/mapObjects/CGTownInstance.cpp
View File

@ -1154,7 +1154,7 @@ void CGTownInstance::setVisitingHero(CGHeroInstance *h)
{ {
//if (!(!!visitingHero == !h)) //if (!(!!visitingHero == !h))
//{ //{
// logGlobal->warnStream() << boost::format("Hero visiting town %s is %s ") % name % (visitingHero.get() ? visitingHero->name : "NULL"); // logGlobal->warn("Hero visiting town %s is %s ", name, (visitingHero.get() ? visitingHero->name : "NULL"));
// logGlobal->warn("New hero will be %s ", (h ? h->name : "NULL")); // logGlobal->warn("New hero will be %s ", (h ? h->name : "NULL"));
// //
//} //}

2
lib/mapObjects/CQuest.cpp
View File

@ -1049,7 +1049,7 @@ void CGKeys::setPropertyDer (ui8 what, ui32 val) //101-108 - enable key for play
playerKeyMap[player].insert((ui8)val); playerKeyMap[player].insert((ui8)val);
} }
else else
logGlobal->errorStream() << boost::format("Unexpected properties requested to set: what=%d, val=%d") % (int)what % val; logGlobal->error("Unexpected properties requested to set: what=%d, val=%d", (int)what, val);
} }
bool CGKeys::wasMyColorVisited (PlayerColor player) const bool CGKeys::wasMyColorVisited (PlayerColor player) const

4
lib/mapping/CMapEditManager.cpp
View File

@ -575,14 +575,14 @@ void CDrawTerrainOperation::updateTerrainTypes()
{ {
const auto & centerPos = *(positions.begin()); const auto & centerPos = *(positions.begin());
auto centerTile = map->getTile(centerPos); auto centerTile = map->getTile(centerPos);
//logGlobal->debugStream() << boost::format("Set terrain tile at pos '%s' to type '%s'") % centerPos % centerTile.terType; //logGlobal->debug("Set terrain tile at pos '%s' to type '%s'", centerPos, centerTile.terType);
auto tiles = getInvalidTiles(centerPos); auto tiles = getInvalidTiles(centerPos);
auto updateTerrainType = [&](const int3 & pos) auto updateTerrainType = [&](const int3 & pos)
{ {
map->getTile(pos).terType = centerTile.terType; map->getTile(pos).terType = centerTile.terType;
positions.insert(pos); positions.insert(pos);
invalidateTerrainViews(pos); invalidateTerrainViews(pos);
//logGlobal->debugStream() << boost::format("Set additional terrain tile at pos '%s' to type '%s'") % pos % centerTile.terType; //logGlobal->debug("Set additional terrain tile at pos '%s' to type '%s'", pos, centerTile.terType);
}; };
// Fill foreign invalid tiles // Fill foreign invalid tiles

8
lib/mapping/MapFormatH3M.cpp
View File

@ -810,7 +810,7 @@ void CMapLoaderH3M::loadArtifactsOfHero(CGHeroInstance * hero)
{ {
if(hero->artifactsWorn.size() || hero->artifactsInBackpack.size()) if(hero->artifactsWorn.size() || hero->artifactsInBackpack.size())
{ {
logGlobal->warnStream() << boost::format("Hero %s at %s has set artifacts twice (in map properties and on adventure map instance). Using the latter set...") % hero->name % hero->pos; logGlobal->warn("Hero %s at %s has set artifacts twice (in map properties and on adventure map instance). Using the latter set...", hero->name, hero->pos);
hero->artifactsInBackpack.clear(); hero->artifactsInBackpack.clear();
while(hero->artifactsWorn.size()) while(hero->artifactsWorn.size())
hero->eraseArtSlot(hero->artifactsWorn.begin()->first); hero->eraseArtSlot(hero->artifactsWorn.begin()->first);
@ -1622,7 +1622,7 @@ CGObjectInstance * CMapLoaderH3M::readHero(ObjectInstanceID idToBeGiven, const i
if(nhi->secSkills.size()) if(nhi->secSkills.size())
{ {
nhi->secSkills.clear(); nhi->secSkills.clear();
//logGlobal->warnStream() << boost::format("Hero %s subID=%d has set secondary skills twice (in map properties and on adventure map instance). Using the latter set...") % nhi->name % nhi->subID; //logGlobal->warn("Hero %s subID=%d has set secondary skills twice (in map properties and on adventure map instance). Using the latter set...", nhi->name, nhi->subID);
} }
int howMany = reader.readUInt32(); int howMany = reader.readUInt32();
@ -1680,7 +1680,7 @@ CGObjectInstance * CMapLoaderH3M::readHero(ObjectInstanceID idToBeGiven, const i
if(nhi->spells.size()) if(nhi->spells.size())
{ {
nhi->clear(); nhi->clear();
logGlobal->warnStream() << boost::format("Hero %s subID=%d has spells set twice (in map properties and on adventure map instance). Using the latter set...") % nhi->name % nhi->subID; logGlobal->warn("Hero %s subID=%d has spells set twice (in map properties and on adventure map instance). Using the latter set...", nhi->name, nhi->subID);
} }
if(hasCustomSpells) if(hasCustomSpells)
@ -1713,7 +1713,7 @@ CGObjectInstance * CMapLoaderH3M::readHero(ObjectInstanceID idToBeGiven, const i
.And(Selector::sourceType(Bonus::HERO_BASE_SKILL)), nullptr); .And(Selector::sourceType(Bonus::HERO_BASE_SKILL)), nullptr);
if(ps->size()) if(ps->size())
{ {
logGlobal->warnStream() << boost::format("Hero %s subID=%d has set primary skills twice (in map properties and on adventure map instance). Using the latter set...") % nhi->name % nhi->subID; logGlobal->warn("Hero %s subID=%d has set primary skills twice (in map properties and on adventure map instance). Using the latter set...", nhi->name, nhi->subID);
for(auto b : *ps) for(auto b : *ps)
nhi->removeBonus(b); nhi->removeBonus(b);
} }

6
lib/rmg/CMapGenOptions.cpp
View File

@ -292,10 +292,10 @@ void CMapGenOptions::finalize(CRandomGenerator & rand)
default: default:
assert(false); assert(false);
} }
logGlobal->traceStream() << boost::format("Player %d: %s") % player.second.getColor() % playerType; logGlobal->trace("Player %d: %s", player.second.getColor(), playerType);
} }
setCompOnlyPlayerCount(cpuOnlyPlayers); //human players are set automaticlaly (?) setCompOnlyPlayerCount(cpuOnlyPlayers); //human players are set automaticlaly (?)
logGlobal->infoStream() << boost::format("Final player config: %d total, %d cpu-only") % players.size() % (int)getCompOnlyPlayerCount(); logGlobal->info("Final player config: %d total, %d cpu-only", players.size(), (int)getCompOnlyPlayerCount());
} }
void CMapGenOptions::updatePlayers() void CMapGenOptions::updatePlayers()
@ -340,7 +340,7 @@ void CMapGenOptions::updateCompOnlyPlayers()
if (compOnlyPlayersToAdd < 0) if (compOnlyPlayersToAdd < 0)
{ {
logGlobal->errorStream() << boost::format("Incorrect number of players to add. Requested players %d, current players %d") % playerCount % players.size(); logGlobal->error("Incorrect number of players to add. Requested players %d, current players %d", playerCount, players.size());
assert (compOnlyPlayersToAdd < 0); assert (compOnlyPlayersToAdd < 0);
} }
for(int i = 0; i < compOnlyPlayersToAdd; ++i) for(int i = 0; i < compOnlyPlayersToAdd; ++i)

2
lib/rmg/CMapGenerator.cpp
View File

@ -461,7 +461,7 @@ void CMapGenerator::createObstaclesCommon2()
} }
} }
} }
logGlobal->traceStream() << boost::format("Set %d tiles to BLOCKED and %d tiles to FREE") % blockedTiles % freeTiles; logGlobal->trace("Set %d tiles to BLOCKED and %d tiles to FREE", blockedTiles, freeTiles);
} }
} }

2
lib/rmg/CRmgTemplateStorage.cpp
View File

@ -228,7 +228,7 @@ void CRmgTemplateStorage::loadObject(std::string scope, std::string name, const
} }
catch(const std::exception & e) catch(const std::exception & e)
{ {
logGlobal->errorStream() << boost::format("Template %s has errors. Message: %s.") % tpl->getName() % std::string(e.what()); logGlobal->error("Template %s has errors. Message: %s.", tpl->getName(), std::string(e.what()));
} }
} }

6
lib/rmg/CRmgTemplateZone.cpp
View File

@ -839,7 +839,7 @@ bool CRmgTemplateZone::createRoad(CMapGenerator* gen, const int3& src, const int
} }
} }
logGlobal->warnStream() << boost::format("Failed to create road from %s to %s") % src %dst; logGlobal->warn("Failed to create road from %s to %s", src, dst);
return false; return false;
} }
@ -1927,7 +1927,7 @@ bool CRmgTemplateZone::findPlaceForTreasurePile(CMapGenerator* gen, float min_di
bool needsGuard = value > minGuardedValue; bool needsGuard = value > minGuardedValue;
//logGlobal->infoStream() << boost::format("Min dist for density %f is %d") % density % min_dist; //logGlobal->info("Min dist for density %f is %d", density, min_dist);
for(auto tile : possibleTiles) for(auto tile : possibleTiles)
{ {
auto dist = gen->getNearestObjectDistance(tile); auto dist = gen->getNearestObjectDistance(tile);
@ -2099,7 +2099,7 @@ void CRmgTemplateZone::checkAndPlaceObject(CMapGenerator* gen, CGObjectInstance*
void CRmgTemplateZone::placeObject(CMapGenerator* gen, CGObjectInstance* object, const int3 &pos, bool updateDistance) void CRmgTemplateZone::placeObject(CMapGenerator* gen, CGObjectInstance* object, const int3 &pos, bool updateDistance)
{ {
//logGlobal->traceStream() << boost::format("Inserting object at %d %d") % pos.x % pos.y; //logGlobal->trace("Inserting object at %d %d", pos.x, pos.y);
checkAndPlaceObject (gen, object, pos); checkAndPlaceObject (gen, object, pos);

2
lib/rmg/CZonePlacer.cpp
View File

@ -147,7 +147,7 @@ void CZonePlacer::placeZones(const CMapGenOptions * mapGenOptions, CRandomGenera
} }
} }
logGlobal->traceStream() << boost::format("Best fitness reached: total distance %2.4f, total overlap %2.4f") % bestTotalDistance % bestTotalOverlap; logGlobal->trace("Best fitness reached: total distance %2.4f, total overlap %2.4f", bestTotalDistance, bestTotalOverlap);
for (auto zone : zones) //finalize zone positions for (auto zone : zones) //finalize zone positions
{ {
zone.second->setPos (cords (bestSolution[zone.second])); zone.second->setPos (cords (bestSolution[zone.second]));