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

Resolved bugs #76 and #168 which always gave same heroes in tavern.

Browse Source
This commit is contained in:
DjWarmonger
2009-11-15 14:06:25 +00:00
parent d18b6c3d5a
commit adf3c9fd4b
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/CGameState.cpp
View File

@ -873,7 +873,7 @@ CGHeroInstance * CGameState::HeroesPool::pickHeroFor(bool native, int player, co
if(pavailable.find(i->first)->second & 1<<player
&& i->second->type->heroType/2 == town->typeID)
{
pool.push_back(i->second);
pool.push_back(i->second); //get all avaliable heroes
}
}
if(!pool.size())
@ -895,7 +895,7 @@ CGHeroInstance * CGameState::HeroesPool::pickHeroFor(bool native, int player, co
if(pavailable.find(i->first)->second & 1<<player)
{
pool.push_back(i->second);
sum += i->second->type->heroClass->selectionProbability[town->typeID];
sum += i->second->type->heroClass->selectionProbability[town->typeID]; //total weight
}
}
if(!pool.size())
@ -905,11 +905,14 @@ CGHeroInstance * CGameState::HeroesPool::pickHeroFor(bool native, int player, co
}
r = rand()%sum;
for(unsigned int i=0; i<pool.size(); i++)
for (unsigned int i=0; i<pool.size(); i++)
{
r -= pool[i]->type->heroClass->selectionProbability[town->typeID];
if(r<0)
if(r < 0)
{
ret = pool[i];
break;
}
}
if(!ret)
ret = pool.back();