1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-17 01:32:21 +02:00

Merge pull request #5844 from IvanSavenko/bonus_fixes

Fixes to bonus system functionality
This commit is contained in:
Ivan Savenko
2025-06-30 11:58:42 +03:00
committed by GitHub
92 changed files with 565 additions and 295 deletions

View File

@ -261,7 +261,7 @@ CExchangeWindow::CExchangeWindow(ObjectInstanceID hero1, ObjectInstanceID hero2,
}
}
CExchangeWindow::update();
CExchangeWindow::updateArtifacts();
}
void CExchangeWindow::creatureArrowButtonCallback(bool leftToRight, SlotID slotId)
@ -361,7 +361,7 @@ void CExchangeWindow::updateGarrisons()
{
garr->recreateSlots();
update();
updateArtifacts();
}
bool CExchangeWindow::holdsGarrison(const CArmedInstance * army)
@ -375,13 +375,13 @@ void CExchangeWindow::questLogShortcut()
GAME->interface()->showQuestLog();
}
void CExchangeWindow::update()
void CExchangeWindow::updateArtifacts()
{
const bool qeLayout = isQuickExchangeLayoutAvailable();
OBJECT_CONSTRUCTION;
CWindowWithArtifacts::update();
CWindowWithArtifacts::updateArtifacts();
for(size_t leftRight : {0, 1})
{