mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-24 22:14:36 +02:00
Merge branch 'develop' of https://github.com/vcmi/vcmi into BuildingManager
# Conflicts: # AI/VCAI/CMakeLists.txt
This commit is contained in:
commit
4a85559d4b
@ -55,7 +55,10 @@ bool BuildingManager::tryBuildThisStructure(const CGTownInstance * t, BuildingID
|
||||
EBuildingState::EBuildingState canBuild = cb->canBuildStructure(t, buildID);
|
||||
if (canBuild == EBuildingState::ALLOWED)
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 079ea69b43b0faabece4e9703ee089eb34486ff2
|
||||
PotentialBuilding pb;
|
||||
pb.bid = buildID;
|
||||
pb.price = t->getBuildingCost(buildID);
|
||||
@ -100,7 +103,10 @@ bool BuildingManager::tryBuildAnyStructure(const CGTownInstance * t, std::vector
|
||||
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
|
||||
{
|
||||
for (const auto & building : buildList)
|
||||
@ -227,7 +233,10 @@ bool BuildingManager::getBuildingOptions(const CGTownInstance * t)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 079ea69b43b0faabece4e9703ee089eb34486ff2
|
||||
}
|
||||
|
||||
boost::optional<PotentialBuilding> BuildingManager::immediateBuilding() const
|
||||
@ -245,4 +254,7 @@ boost::optional<PotentialBuilding> BuildingManager::expensiveBuilding() const
|
||||
else
|
||||
return boost::optional<PotentialBuilding>();
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 079ea69b43b0faabece4e9703ee089eb34486ff2
|
||||
|
@ -71,4 +71,8 @@ private:
|
||||
|
||||
void setCB(CPlayerSpecificInfoCallback * CB) override;
|
||||
void setAI(VCAI * AI) override;
|
||||
<<<<<<< HEAD
|
||||
};
|
||||
=======
|
||||
};
|
||||
>>>>>>> 079ea69b43b0faabece4e9703ee089eb34486ff2
|
||||
|
@ -13,6 +13,8 @@ set(VCAI_SRCS
|
||||
ResourceManager.cpp
|
||||
BuildingManager.cpp
|
||||
MapObjectsEvaluator.cpp
|
||||
BuildingManager.cpp
|
||||
MapObjectsEvaluator.cpp
|
||||
Fuzzy.cpp
|
||||
Goals.cpp
|
||||
main.cpp
|
||||
@ -27,6 +29,8 @@ set(VCAI_HEADERS
|
||||
ResourceManager.h
|
||||
BuildingManager.h
|
||||
MapObjectsEvaluator.h
|
||||
BuildingManager.h
|
||||
MapObjectsEvaluator.h
|
||||
Fuzzy.h
|
||||
Goals.h
|
||||
VCAI.h
|
||||
|
Loading…
Reference in New Issue
Block a user