games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-10 22:31:40 +02:00
Code Issues Releases Activity

Merge pull request #5350 from MichalZr6/fix_miniHillFort

Browse Source 
Fix creating buttons in Stack Window when upgrade is unavailable
This commit is contained in:
Ivan Savenko
2025-02-04 01:02:50 +02:00
committed by GitHub
parent b2218398c8 93414eb3bf
commit d72b743ce5
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/windows/CCreatureWindow.cpp
View File

@@ -773,9 +773,13 @@ CStackWindow::CStackWindow(const CStackInstance * stack, std::function<void()> d
info->creature = stack->getCreature(); info->creature = stack->getCreature();
info->creatureCount = stack->count; info->creatureCount = stack->count;
info->upgradeInfo = std::make_optional(UnitView::StackUpgradeInfo(upgradeInfo)); if(upgradeInfo.canUpgrade())
{
info->upgradeInfo = std::make_optional(UnitView::StackUpgradeInfo(upgradeInfo));
info->upgradeInfo->callback = callback;
}
info->dismissInfo = std::make_optional(UnitView::StackDismissInfo()); info->dismissInfo = std::make_optional(UnitView::StackDismissInfo());
info->upgradeInfo->callback = callback;
info->dismissInfo->callback = dismiss; info->dismissInfo->callback = dismiss;
info->owner = dynamic_cast<const CGHeroInstance *> (stack->armyObj); info->owner = dynamic_cast<const CGHeroInstance *> (stack->armyObj);
init(); init();

17
lib/gameState/UpgradeInfo.h
View File

@@ -11,6 +11,7 @@
#include "../lib/constants/EntityIdentifiers.h" #include "../lib/constants/EntityIdentifiers.h"
#include "../lib/ResourceSet.h" #include "../lib/ResourceSet.h"
#include <boost/container/small_vector.hpp>
VCMI_LIB_NAMESPACE_BEGIN VCMI_LIB_NAMESPACE_BEGIN
@@ -25,9 +26,11 @@ public:
CreatureID oldID; //creature to be upgraded CreatureID oldID; //creature to be upgraded
const std::vector<CreatureID> & getAvailableUpgrades() const const boost::container::small_vector<CreatureID, 4> & getAvailableUpgrades() const
{ {
return upgradesIDs; static const boost::container::small_vector<CreatureID, 4> emptyUpgrades;
return (isAvailable && !upgradesIDs.empty()) ? upgradesIDs : emptyUpgrades;
} }
const CreatureID & getUpgrade() const const CreatureID & getUpgrade() const
@@ -44,9 +47,11 @@ public:
return upgradesCosts[std::distance(upgradesIDs.begin(), idIt)]; return upgradesCosts[std::distance(upgradesIDs.begin(), idIt)];
} }
const std::vector<ResourceSet> & getAvailableUpgradeCosts() const const boost::container::small_vector<ResourceSet, 4> & getAvailableUpgradeCosts() const
{ {
return upgradesCosts; static const boost::container::small_vector<ResourceSet, 4> emptyCosts;
return (isAvailable && !upgradesCosts.empty()) ? upgradesCosts : emptyCosts;
} }
const ResourceSet & getUpgradeCosts() const const ResourceSet & getUpgradeCosts() const
@@ -73,8 +78,8 @@ public:
} }
private: private:
std::vector<CreatureID> upgradesIDs; //possible upgrades boost::container::small_vector<CreatureID, 4> upgradesIDs; //possible upgrades
std::vector<ResourceSet> upgradesCosts; // cost[upgrade_serial] -> set of pairs<resource_ID,resource_amount>; cost is for single unit (not entire stack) boost::container::small_vector<ResourceSet, 4> upgradesCosts; // cost[upgrade_serial] -> set of pairs<resource_ID,resource_amount>; cost is for single unit (not entire stack)
bool isAvailable; // flag for unavailableUpgrades like in miniHillFort from HoTA bool isAvailable; // flag for unavailableUpgrades like in miniHillFort from HoTA
}; };