games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Merge pull request #626 from nullkiller/fix-quest

Browse Source 
Fix quest handling
This commit is contained in:
Alexander Shishkin
2020-01-31 10:24:04 +03:00
committed by GitHub
parent 00de1fd734 42cab00c38
commit 0f7de511be
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/mapObjects/CQuest.cpp
View File

@@ -94,18 +94,25 @@ bool CQuest::checkQuest(const CGHeroInstance * h) const
std::vector<CStackBasicDescriptor>::const_iterator cre; std::vector<CStackBasicDescriptor>::const_iterator cre;
TSlots::const_iterator it; TSlots::const_iterator it;
ui32 count; ui32 count;
ui32 slotsCount = 0;
bool hasExtraCreatures = false;
for(cre = m6creatures.begin(); cre != m6creatures.end(); ++cre) for(cre = m6creatures.begin(); cre != m6creatures.end(); ++cre)
{ {
for(count = 0, it = h->Slots().begin(); it != h->Slots().end(); ++it) for(count = 0, it = h->Slots().begin(); it != h->Slots().end(); ++it)
{ {
if(it->second->type == cre->type) if(it->second->type == cre->type)
{
count += it->second->count; count += it->second->count;
slotsCount++;
}
} }
if(count < cre->count) //not enough creatures of this kind if(count < cre->count) //not enough creatures of this kind
return false; return false;
hasExtraCreatures |= count > cre->count;
} }
return hasExtraCreatures || slotsCount < h->Slots().size();
} }
return true;
case MISSION_RESOURCES: case MISSION_RESOURCES:
for(Res::ERes i = Res::WOOD; i <= Res::GOLD; vstd::advance(i, +1)) //including Mithril ? for(Res::ERes i = Res::WOOD; i <= Res::GOLD; vstd::advance(i, +1)) //including Mithril ?
{ //Quest has no direct access to callback { //Quest has no direct access to callback