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

Proper fix for #1712 - Building requirement tests are now fixed

Browse Source 
- added minimize() method in logical expressions that will remove excessive elements
- replaced forEach() with morph() that allows replacing types in variant
This commit is contained in:
Ivan Savenko
2014-08-07 19:40:22 +03:00
parent 4d6ab2c32d
commit d1dd7eef48
8 changed files with 115 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/CGameInfoCallback.cpp
View File

@@ -403,33 +403,12 @@ EBuildingState::EBuildingState CGameInfoCallback::canBuildStructure( const CGTow
return EBuildingState::NO_WATER; //lack of water
}
/// returns true if building prerequisites are fulfilled
std::function<bool(BuildingID)> buildTest;
auto dependTest = [&](BuildingID id) -> bool
auto buildTest = [&](BuildingID id) -> bool
{
const CBuilding * build = t->town->buildings.at(id);
if (build->upgrade != BuildingID::NONE)
{
if (!t->hasBuilt(build->upgrade))
return false;
if (!t->town->buildings.at(build->upgrade)->requirements.test(buildTest))
return false;
}
if (!build->requirements.test(buildTest))
return false;
return true;
return t->hasBuilt(id);
};
buildTest = [&](BuildingID bid)
{
return t->hasBuilt(bid) && dependTest(bid);
};
if (!dependTest(ID))
if (!t->genBuildingRequirements(ID).test(buildTest))
return EBuildingState::PREREQUIRES;
if(t->builded >= VLC->modh->settings.MAX_BUILDING_PER_TURN)