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

Sweet Jesus

Browse Source
This commit is contained in:
DJWarmonger 2018-08-04 16:22:24 +02:00
parent 4a85559d4b
commit 976eeb3578
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
AI/VCAI/BuildingManager.cpp
View File

@ -55,10 +55,6 @@ bool BuildingManager::tryBuildThisStructure(const CGTownInstance * t, BuildingID
EBuildingState::EBuildingState canBuild = cb->canBuildStructure(t, buildID); EBuildingState::EBuildingState canBuild = cb->canBuildStructure(t, buildID);
if (canBuild == EBuildingState::ALLOWED) if (canBuild == EBuildingState::ALLOWED)
{ {
<<<<<<< HEAD
=======
>>>>>>> 079ea69b43b0faabece4e9703ee089eb34486ff2
PotentialBuilding pb; PotentialBuilding pb;
pb.bid = buildID; pb.bid = buildID;
pb.price = t->getBuildingCost(buildID); pb.price = t->getBuildingCost(buildID);
@ -103,10 +99,6 @@ bool BuildingManager::tryBuildAnyStructure(const CGTownInstance * t, std::vector
return false; //Can't build anything return false; //Can't build anything
} }
<<<<<<< HEAD
=======
>>>>>>> 079ea69b43b0faabece4e9703ee089eb34486ff2
boost::optional<BuildingID> BuildingManager::canBuildAnyStructure(const CGTownInstance * t, const std::vector<BuildingID> & buildList, unsigned int maxDays) const boost::optional<BuildingID> BuildingManager::canBuildAnyStructure(const CGTownInstance * t, const std::vector<BuildingID> & buildList, unsigned int maxDays) const
{ {
for (const auto & building : buildList) for (const auto & building : buildList)
@ -233,10 +225,6 @@ bool BuildingManager::getBuildingOptions(const CGTownInstance * t)
return true; return true;
return false; return false;
<<<<<<< HEAD
=======
>>>>>>> 079ea69b43b0faabece4e9703ee089eb34486ff2
} }
boost::optional<PotentialBuilding> BuildingManager::immediateBuilding() const boost::optional<PotentialBuilding> BuildingManager::immediateBuilding() const
@ -254,7 +242,3 @@ boost::optional<PotentialBuilding> BuildingManager::expensiveBuilding() const
else else
return boost::optional<PotentialBuilding>(); return boost::optional<PotentialBuilding>();
} }
<<<<<<< HEAD
=======
>>>>>>> 079ea69b43b0faabece4e9703ee089eb34486ff2

4
AI/VCAI/BuildingManager.h
View File

@ -71,8 +71,4 @@ private:
void setCB(CPlayerSpecificInfoCallback * CB) override; void setCB(CPlayerSpecificInfoCallback * CB) override;
void setAI(VCAI * AI) override; void setAI(VCAI * AI) override;
<<<<<<< HEAD
}; };
=======
};
>>>>>>> 079ea69b43b0faabece4e9703ee089eb34486ff2