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

Hopefully fixed compilation. Unified line endings.

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2009-12-30 07:49:25 +00:00
parent 6bff8aec34
commit 5d74e61e3e
9 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/CGameState.cpp
View File

@ -1796,20 +1796,20 @@ int CGameState::getMovementCost(const CGHeroInstance *h, const int3 &src, const
}
return ret;
}
std::set<int> CGameState::getBuildingRequiments(const CGTownInstance *t, int ID)
{
std::set<int> CGameState::getBuildingRequiments(const CGTownInstance *t, int ID)
{
std::set<int> used;
used.insert(ID);
used.insert(ID);
std::set<int> reqs = VLC->townh->requirements[t->subID][ID];
while(true)
{
size_t noloop=0;
for(std::set<int>::iterator i=reqs.begin();i!=reqs.end();i++)
{
if(used.find(*i)==used.end()) //we haven't added requirements for this building
{
{
used.insert(*i);
for(
std::set<int>::iterator j=VLC->townh->requirements[t->subID][*i].begin();
@ -1826,14 +1826,14 @@ std::set<int> CGameState::getBuildingRequiments(const CGTownInstance *t, int ID)
}
if(noloop==reqs.size())
break;
}
return reqs;
}
}
return reqs;
}
int CGameState::canBuildStructure( const CGTownInstance *t, int ID )
{
int ret = 7; //allowed by default
int ret = 7; //allowed by default
if(t->builded >= MAX_BUILDING_PER_TURN)
ret = 5; //building limit
@ -1849,8 +1849,8 @@ int CGameState::canBuildStructure( const CGTownInstance *t, int ID )
ret = 6; //lack of res
}
//checking for requirements
std::set<int> reqs = getBuildingRequiments(t, ID);//getting all requiments
//checking for requirements
std::set<int> reqs = getBuildingRequiments(t, ID);//getting all requiments
for( std::set<int>::iterator ri = reqs.begin(); ri != reqs.end(); ri++ )
{