games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Merge branch 'develop' of https://github.com/vcmi/vcmi into BuildingManager

Browse Source 
# Conflicts:
#	AI/VCAI/CMakeLists.txt
This commit is contained in:
DJWarmonger
2018-08-04 16:03:18 +02:00
parent 6615870045 b0e1b8c5ec
commit 4a85559d4b
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
AI/VCAI/BuildingManager.cpp
View File

@@ -55,7 +55,10 @@ 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);
@@ -100,7 +103,10 @@ 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)
@@ -227,7 +233,10 @@ 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
@@ -245,4 +254,7 @@ 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,4 +71,8 @@ private:
void setCB(CPlayerSpecificInfoCallback * CB) override; void setCB(CPlayerSpecificInfoCallback * CB) override;
void setAI(VCAI * AI) override; void setAI(VCAI * AI) override;
<<<<<<< HEAD
}; };
=======
};
>>>>>>> 079ea69b43b0faabece4e9703ee089eb34486ff2

4
AI/VCAI/CMakeLists.txt
View File

@@ -13,6 +13,8 @@ set(VCAI_SRCS
ResourceManager.cpp ResourceManager.cpp
BuildingManager.cpp BuildingManager.cpp
MapObjectsEvaluator.cpp MapObjectsEvaluator.cpp
BuildingManager.cpp
MapObjectsEvaluator.cpp
Fuzzy.cpp Fuzzy.cpp
Goals.cpp Goals.cpp
main.cpp main.cpp
@@ -27,6 +29,8 @@ set(VCAI_HEADERS
ResourceManager.h ResourceManager.h
BuildingManager.h BuildingManager.h
MapObjectsEvaluator.h MapObjectsEvaluator.h
BuildingManager.h
MapObjectsEvaluator.h
Fuzzy.h Fuzzy.h
Goals.h Goals.h
VCAI.h VCAI.h