games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

CastleInterface: Exclude previous building upgrade in reqs

Browse Source 
Hide CityHall from Capitol prerequisites in Capitol build window
This commit is contained in:
Sandy Carter
2015-08-19 12:05:43 -04:00
parent 237d3f2624
commit bdee647525
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/mapObjects/CGTownInstance.cpp
View File

@@ -1046,7 +1046,7 @@ bool CGTownInstance::hasBuilt(BuildingID buildingID) const
return vstd::contains(builtBuildings, buildingID);
}
CBuilding::TRequired CGTownInstance::genBuildingRequirements(BuildingID buildID) const
CBuilding::TRequired CGTownInstance::genBuildingRequirements(BuildingID buildID, bool includeUpgrade) const
{
const CBuilding * building = town->buildings.at(buildID);
@@ -1069,7 +1069,8 @@ CBuilding::TRequired CGTownInstance::genBuildingRequirements(BuildingID buildID)
{
const CBuilding * upgr = town->buildings.at(building->upgrade);
requirements.expressions.push_back(upgr->bid);
if (includeUpgrade)
requirements.expressions.push_back(upgr->bid);
requirements.expressions.push_back(upgr->requirements.morph(dependTest));
}
requirements.expressions.push_back(building->requirements.morph(dependTest));