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

Merge pull request #1700 from rilian-la-te/resource-array

Browse Source 
Modernize resourceSet.
This commit is contained in:
Ivan Savenko
2023-04-02 20:12:45 +03:00
committed by GitHub
parent 6dac15c5b2 6d17b9342d
commit c661419897
15 changed files with 143 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
client/windows/GUIClasses.cpp
View File

@@ -1079,7 +1079,7 @@ void CExchangeWindow::updateWidgets()
}
}
CShipyardWindow::CShipyardWindow(const std::vector<si32> & cost, int state, int boatType, const std::function<void()> & onBuy)
CShipyardWindow::CShipyardWindow(const TResources & cost, int state, int boatType, const std::function<void()> & onBuy)
: CStatusbarWindow(PLAYER_COLORED, "TPSHIP")
{
OBJECT_CONSTRUCTION_CAPTURING(255-DISPOSE);
@@ -1456,15 +1456,11 @@ void CHillFortWindow::updateGarrisons()
{
std::array<TResources, slotsCount> costs;// costs [slot ID] [resource ID] = resource count for upgrade
TResources totalSumm; // totalSum[resource ID] = value
totalSumm.resize(GameConstants::RESOURCE_QUANTITY);
for(int i=0; i<GameConstants::RESOURCE_QUANTITY; i++)
totalSumm[i]=0;
TResources totalSum; // totalSum[resource ID] = value
for(int i=0; i<slotsCount; i++)
{
costs[i].clear();
std::fill(costs[i].begin(), costs[i].end(), 0);
int newState = getState(SlotID(i));
if(newState != -1)
{
@@ -1473,7 +1469,7 @@ void CHillFortWindow::updateGarrisons()
if(info.newID.size())//we have upgrades here - update costs
{
costs[i] = info.cost[0] * hero->getStackCount(SlotID(i));
totalSumm += costs[i];
totalSum += costs[i];
}
}
@@ -1495,7 +1491,7 @@ void CHillFortWindow::updateGarrisons()
if(allUpgraded)
newState = 1;
if(!totalSumm.canBeAfforded(myRes))
if(!totalSum.canBeAfforded(myRes))
newState = 0;
}
@@ -1543,7 +1539,7 @@ void CHillFortWindow::updateGarrisons()
for(int i = 0; i < resCount; i++)
{
if(totalSumm[i] == 0)
if(totalSum[i] == 0)
{
totalIcons[i]->visible = false;
totalLabels[i]->setText("");
@@ -1551,7 +1547,7 @@ void CHillFortWindow::updateGarrisons()
else
{
totalIcons[i]->visible = true;
totalLabels[i]->setText(std::to_string(totalSumm[i]));
totalLabels[i]->setText(std::to_string(totalSum[i]));
}
}
}