games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

Fixed #860 and #1169

Browse Source 
Imprisoned heroes as well as their commanders will get full level ups, with updated specialty, mana and movement.
This commit is contained in:
DjWarmonger
2013-02-04 12:32:53 +00:00
parent d264f17b76
commit e63747d2d2
7 changed files with 107 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/CCreatureHandler.cpp
View File

@@ -1011,19 +1011,6 @@ CCreatureHandler::~CCreatureHandler()
{
}
static int retreiveRandNum(const boost::function<int()> &randGen)
{
if(randGen)
return randGen();
else
return rand();
}
template <typename T> const T & pickRandomElementOf(const std::vector<T> &v, const boost::function<int()> &randGen)
{
return v.at(retreiveRandNum(randGen) % v.size());
}
int CCreatureHandler::pickRandomMonster(const boost::function<int()> &randGen, int tier) const
{
int r = 0;
@@ -1031,7 +1018,7 @@ int CCreatureHandler::pickRandomMonster(const boost::function<int()> &randGen, i
{
do
{
r = pickRandomElementOf(creatures, randGen)->idNumber;
r = vstd::pickRandomElementOf(creatures, randGen)->idNumber;
} while (vstd::contains(VLC->creh->notUsedMonsters,r));
}
else
@@ -1052,7 +1039,7 @@ int CCreatureHandler::pickRandomMonster(const boost::function<int()> &randGen, i
return 0;
}
return pickRandomElementOf(allowed, randGen);
return vstd::pickRandomElementOf(allowed, randGen);
}
return r;
}