games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-03 13:01:33 +02:00
Code Issues Releases Activity

- fixed bug where having towns with less than 16 heroes would result in

Browse Source 
invalid random heroes on map start.
This commit is contained in:
Ivan Savenko 2013-11-12 10:09:55 +00:00
parent 29d655c621
commit f56cccb716
1 changed files with 3285 additions and 3297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/CGameState.cpp
View File

@ -463,35 +463,24 @@ int CGameState::pickHero(PlayerColor owner)
}
}
//list of heroes for this faction and others
//list of available heroes for this faction and others
std::vector<HeroTypeID> factionHeroes, otherHeroes;
const size_t firstHero = ps.castle*GameConstants::HEROES_PER_TYPE*2;
const size_t lastHero = std::min(firstHero + GameConstants::HEROES_PER_TYPE*2, VLC->heroh->heroes.size()) - 1;
const auto heroesToConsider = getUnusedAllowedHeroes();
for(auto hid : heroesToConsider)
for(HeroTypeID hid : getUnusedAllowedHeroes())
{
if(vstd::iswithin(hid.getNum(), firstHero, lastHero))
if(VLC->heroh->heroes[hid.getNum()]->heroClass->faction == ps.castle)
factionHeroes.push_back(hid);
else
otherHeroes.push_back(hid);
}
// we need random order to select hero
auto randGen = [](size_t range)
{
return ran() % range;
};
boost::random_shuffle(factionHeroes, randGen); // generator must be reference
if(factionHeroes.size())
return factionHeroes.front().getNum();
// select random hero native to "our" faction
if (!factionHeroes.empty())
return factionHeroes.at(ran() % factionHeroes.size()).getNum();
logGlobal->warnStream() << "Cannot find free hero of appropriate faction for player " << owner << " - trying to get first available...";
if(otherHeroes.size())
return otherHeroes.front().getNum();
if(!otherHeroes.empty())
return otherHeroes.at(ran() % otherHeroes.size()).getNum();
logGlobal->errorStream() << "No free allowed heroes!";
auto notAllowedHeroesButStillBetterThanCrash = getUnusedAllowedHeroes(true);
@ -503,7 +492,6 @@ int CGameState::pickHero(PlayerColor owner)
return -1; // no available heroes at all
}
std::pair<Obj,int> CGameState::pickObject (CGObjectInstance *obj)
{
switch(obj->ID)