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

* fixed 8 hero limit to check only for wandering heroes (not garrisoned)

Browse Source 
* srand at the beginning of handleConnection
This commit is contained in:
Michał W. Urbańczyk
2009-04-09 15:05:20 +00:00
parent e3222fd34f
commit 7a9e323297
6 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/CGameHandler.cpp
View File

@@ -485,6 +485,7 @@ void CGameHandler::prepareAttack(BattleAttack &bat, CStack *att, CStack *def)
}
void CGameHandler::handleConnection(std::set<int> players, CConnection &c)
{
srand(time(NULL));
CPack *pack = NULL;
try
{
@@ -1746,6 +1747,13 @@ void CGameHandler::garrisonSwap(si32 tid)
}
else if (town->garrisonHero && !town->visitingHero) //move hero out of the garrison
{
//check if moving hero out of town will break 8 wandering heroes limit
if(getHeroCount(town->garrisonHero->tempOwner,true) >= 8)
{
complain("Cannot move hero out of the garrison, there are already 8 wandering heroes!");
return;
}
SetHeroesInTown intown;
intown.tid = tid;
intown.garrison = -1;
@@ -1870,7 +1878,7 @@ void CGameHandler::hireHero( ui32 tid, ui8 hid )
if(!vstd::contains(t->builtBuildings,5) //no tavern in the town
|| gs->getPlayer(t->tempOwner)->resources[6]<2500 //not enough gold
|| t->visitingHero //there is visiting hero - no place
|| gs->getPlayer(t->tempOwner)->heroes.size()>7 //8 hero limit
|| getHeroCount(t->tempOwner,false) >= 8 && complain("Cannot hire hero, only 8 wandering heroes are allowed!")
)
return;
CGHeroInstance *nh = gs->getPlayer(t->tempOwner)->availableHeroes[hid];