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

vcmi: massive refactoring v1

Browse Source
This commit is contained in:
Konstantin
2023-04-05 03:26:29 +03:00
parent ee489f18d2
commit 11b237a23c
129 changed files with 803 additions and 762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/windows/QuickRecruitmentWindow.cpp
View File

@@ -93,7 +93,7 @@ void QuickRecruitmentWindow::maxAllCards(std::vector<std::shared_ptr<CreaturePur
i->sliderMoved(maxAmount);
i->slider->moveToMax();
allAvailableResources -= (i->creatureOnTheCard->cost * maxAmount);
allAvailableResources -= (i->creatureOnTheCard->getFullRecruitCost() * maxAmount);
}
maxButton->block(allAvailableResources == LOCPLINT->cb->getResourceAmount());
}
@@ -105,8 +105,8 @@ void QuickRecruitmentWindow::purchaseUnits()
{
if(selected->slider->getValue())
{
auto onRecruit = [=](CreatureID id, int count){ LOCPLINT->cb->recruitCreatures(town, town->getUpperArmy(), id, count, selected->creatureOnTheCard->level-1); };
CreatureID crid = selected->creatureOnTheCard->idNumber;
auto onRecruit = [=](CreatureID id, int count){ LOCPLINT->cb->recruitCreatures(town, town->getUpperArmy(), id, count, selected->creatureOnTheCard->getLevel()-1); };
CreatureID crid = selected->creatureOnTheCard->getId();
SlotID dstslot = town -> getSlotFor(crid);
if(!dstslot.validSlot())
continue;
@@ -129,7 +129,7 @@ void QuickRecruitmentWindow::updateAllSliders()
{
auto allAvailableResources = LOCPLINT->cb->getResourceAmount();
for(auto i : boost::adaptors::reverse(cards))
allAvailableResources -= (i->creatureOnTheCard->cost * i->slider->getValue());
allAvailableResources -= (i->creatureOnTheCard->getFullRecruitCost() * i->slider->getValue());
for(auto i : cards)
{
si32 maxAmount = i->creatureOnTheCard->maxAmount(allAvailableResources);