From a8696a9957f852344bb37cdd73a67b39e6aa57a6 Mon Sep 17 00:00:00 2001 From: DJWarmonger Date: Fri, 27 Jul 2018 09:22:07 +0200 Subject: [PATCH] formatting --- AI/VCAI/AIUtility.cpp | 4 ++-- AI/VCAI/AIhelper.cpp | 2 +- AI/VCAI/Goals.cpp | 6 +++--- AI/VCAI/ResourceManager.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/AI/VCAI/AIUtility.cpp b/AI/VCAI/AIUtility.cpp index a87c59c5e..42be6f94c 100644 --- a/AI/VCAI/AIUtility.cpp +++ b/AI/VCAI/AIUtility.cpp @@ -503,10 +503,10 @@ ui64 howManyReinforcementsCanBuy(HeroPtr h, const CGTownInstance * t) ui64 aivalue = 0; int freeHeroSlots = GameConstants::ARMY_SIZE - h->stacksCount(); - for (auto const dc : t->creatures) + for(auto const dc : t->creatures) { creInfo ci = infoFromDC(dc); - if (ci.count && ci.creID != -1) //valid creature at this level + if(ci.count && ci.creID != -1) //valid creature at this level { //can be merged with another stack? SlotID dst = h->getSlotFor(ci.creID); diff --git a/AI/VCAI/AIhelper.cpp b/AI/VCAI/AIhelper.cpp index 90dab596d..50f34fae9 100644 --- a/AI/VCAI/AIhelper.cpp +++ b/AI/VCAI/AIhelper.cpp @@ -16,7 +16,7 @@ boost::thread_specific_ptr ah; AIhelper::AIhelper() { - resourceManager.reset(new ResourceManager); + resourceManager.reset(new ResourceManager()); } AIhelper::~AIhelper() diff --git a/AI/VCAI/Goals.cpp b/AI/VCAI/Goals.cpp index a89a25f55..0fe3b46d8 100644 --- a/AI/VCAI/Goals.cpp +++ b/AI/VCAI/Goals.cpp @@ -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(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,9 +989,7 @@ 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))); diff --git a/AI/VCAI/ResourceManager.h b/AI/VCAI/ResourceManager.h index 2e42bdafb..efbed5f25 100644 --- a/AI/VCAI/ResourceManager.h +++ b/AI/VCAI/ResourceManager.h @@ -80,12 +80,12 @@ public: TResource allGold() const override; Goals::TSubgoal whatToDo() const override; //peek highest-priority goal - Goals::TSubgoal whatToDo(TResources &res, Goals::TSubgoal goal); //can we afford this goal or need to CollectRes? + Goals::TSubgoal whatToDo(TResources & res, Goals::TSubgoal goal); //can we afford this goal or need to CollectRes? bool containsObjective(Goals::TSubgoal goal) const; bool hasTasksLeft() const override; protected: //not-const actions only for AI - virtual void reserveResoures(TResources &res, Goals::TSubgoal goal = Goals::TSubgoal()); + virtual void reserveResoures(TResources & res, Goals::TSubgoal goal = Goals::TSubgoal()); virtual bool notifyGoalCompleted(Goals::TSubgoal goal); virtual bool updateGoal(Goals::TSubgoal goal); //new goal must have same properties but different priority virtual bool tryPush(const ResourceObjective &o);