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

Fix quick recruitment failing when there are no free slots in army

Browse Source
This commit is contained in:
Ivan Savenko
2025-07-31 21:53:23 +03:00
parent 099a168158
commit 1744ebffdc
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
client/windows/QuickRecruitmentWindow.cpp
View File

@@ -103,26 +103,35 @@ void QuickRecruitmentWindow::maxAllCards(std::vector<std::shared_ptr<CreaturePur
void QuickRecruitmentWindow::purchaseUnits()
{
int freeSlotsLeft = town->getUpperArmy()->getFreeSlots().size();
for(auto selected : boost::adaptors::reverse(cards))
{
if(selected->slider->getValue())
if(selected->slider->getValue() == 0)
continue;
int level = 0;
int i = 0;
for(auto c : town->getTown()->creatures)
{
int level = 0;
int i = 0;
for(auto c : town->getTown()->creatures)
{
for(auto c2 : c)
if(c2 == selected->creatureOnTheCard->getId())
level = i;
i++;
}
auto onRecruit = [this, level](CreatureID id, int count){ GAME->interface()->cb->recruitCreatures(town, town->getUpperArmy(), id, count, level); };
CreatureID crid = selected->creatureOnTheCard->getId();
SlotID dstslot = town -> getSlotFor(crid);
if(!dstslot.validSlot())
continue;
onRecruit(crid, selected->slider->getValue());
for(auto c2 : c)
if(c2 == selected->creatureOnTheCard->getId())
level = i;
i++;
}
CreatureID crid = selected->creatureOnTheCard->getId();
SlotID dstslot = town->getUpperArmy()->getSlotFor(crid);
if(town->getUpperArmy()->slotEmpty(dstslot))
{
if(freeSlotsLeft == 0)
continue;
freeSlotsLeft -= 1;
}
if(dstslot.validSlot())
GAME->interface()->cb->recruitCreatures(town, town->getUpperArmy(), crid, selected->slider->getValue(), level);
}
close();
}