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

Creature banks are now functional, however there are some glitches listed on our board.

Browse Source
This commit is contained in:
DjWarmonger
2009-09-17 06:19:27 +00:00
parent df6a7d680e
commit 7660e29751
4 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/CGameHandler.cpp
View File

@@ -1566,19 +1566,17 @@ void CGameHandler::giveCreatures (int objid, const CGHeroInstance * h, CCreature
if (creatures->slots.size() <= 0)
return;
CCreatureSet heroArmy = h->army;
while (creatures)
while (*creatures)
{
int slot = heroArmy.getSlotFor(creatures->slots.begin()->second.first);
if(slot < 0)
int slot = heroArmy.getSlotFor (creatures->slots.begin()->second.first);
if (slot < 0)
break;
heroArmy.slots[slot].first = creatures->slots.begin()->second.first;
heroArmy.slots[slot].second += creatures->slots.begin()->second.second;
creatures->slots.erase(creatures->slots.begin());
//ourArmy.slots.erase(ourArmy.slots.begin());
creatures->slots.erase (creatures->slots.begin());
}
if(!creatures) //all creatures can be moved to hero army - do that
if (!*creatures) //all creatures can be moved to hero army - do that
{
SetGarrisons sg;
sg.garrs[h->id] = heroArmy;
@@ -1588,8 +1586,8 @@ void CGameHandler::giveCreatures (int objid, const CGHeroInstance * h, CCreature
{
SetGarrisons sg;
sg.garrs[objid] = *creatures;
sendAndApply(&sg);
showGarrisonDialog(objid, h->id, true, 0);
sendAndApply (&sg);
showGarrisonDialog (objid, h->id, true, 0);
return;
}
}