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

formatting

Browse Source
This commit is contained in:
DJWarmonger
2018-07-27 09:22:07 +02:00
parent 6abebeeb9f
commit a8696a9957
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AI/VCAI/AIhelper.cpp
View File

@@ -16,7 +16,7 @@ boost::thread_specific_ptr<AIhelper> ah;
AIhelper::AIhelper()
{
resourceManager.reset(new ResourceManager);
resourceManager.reset(new ResourceManager());
}
AIhelper::~AIhelper()

6
AI/VCAI/Goals.cpp
View File

@@ -220,7 +220,7 @@ namespace Goals
}
std::string BuyArmy::completeMessage() const
{
return boost::format("Bought army of value %d in town of %s") % boost::lexical_cast<std::string>(value), town->name;
return boost::format("Bought army of value %d in town of %s") % value, town->name;
}
}
@@ -537,8 +537,10 @@ TSubgoal ClearWayTo::whatToDoToAchieve()
bool Goals::ClearWayTo::fulfillsMe(TSubgoal goal)
{
if (goal->goalType == Goals::VISIT_TILE)
{
if (!hero || hero == goal->hero)
return tile == goal->tile;
}
return false;
}
@@ -987,10 +989,8 @@ TGoalVec Goals::CollectRes::getAllPossibleSubgoals()
if (dest != t) //there is something blocking our way
ret.push_back(sptr(Goals::ClearWayTo(dest, h).setisAbstract(true)));
else
{
ret.push_back(sptr(Goals::VisitTile(dest).sethero(h).setisAbstract(true)));
}
}
else //we need to get army in order to pick that object
ret.push_back(sptr(Goals::GatherArmy(evaluateDanger(dest, h) * SAFE_ATTACK_CONSTANT).sethero(h).setisAbstract(true)));
}