games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Fix Issue 2214 (#437)

Browse Source 
CGameInfoCallback::getAvailableHeroes: add checks for tavern
This commit is contained in:
Henning Koehler 2018-03-23 00:14:43 +13:00 committed by ArseniyShestakov
parent cac83379f5
commit 2b64bf29ed
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/CGameInfoCallback.cpp
View File

@ -477,8 +477,14 @@ std::vector<const CGHeroInstance *> CGameInfoCallback::getAvailableHeroes(const
std::vector<const CGHeroInstance *> ret; std::vector<const CGHeroInstance *> ret;
//ERROR_RET_VAL_IF(!isOwnedOrVisited(townOrTavern), "Town or tavern must be owned or visited!", ret); //ERROR_RET_VAL_IF(!isOwnedOrVisited(townOrTavern), "Town or tavern must be owned or visited!", ret);
//TODO: town needs to be owned, advmap tavern needs to be visited; to be reimplemented when visit tracking is done //TODO: town needs to be owned, advmap tavern needs to be visited; to be reimplemented when visit tracking is done
const CGTownInstance * town = getTown(townOrTavern->id);
if(townOrTavern->ID == Obj::TAVERN || (town && town->hasBuilt(BuildingID::TAVERN)))
{
range::copy(gs->players[*player].availableHeroes, std::back_inserter(ret)); range::copy(gs->players[*player].availableHeroes, std::back_inserter(ret));
vstd::erase_if(ret, [](const CGHeroInstance *h) { return h == nullptr; }); vstd::erase_if(ret, [](const CGHeroInstance * h) {
return h == nullptr;
});
}
return ret; return ret;
} }