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

ArtifactUtils::isSlotBackpack() func + refactoring

Browse Source
This commit is contained in:
SoundSSGood
2022-11-18 22:49:57 +02:00
parent 30bbb57619
commit e6e669d024
5 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/widgets/CArtifactHolder.cpp
View File

@@ -208,11 +208,7 @@ bool CHeroArtPlace::askToAssemble(const CArtifactInstance *art, ArtifactPosition
{
assert(art);
assert(hero);
bool assembleEqipped = true;
if(slot >= GameConstants::BACKPACK_START)
{
assembleEqipped = false;
}
bool assembleEqipped = !ArtifactUtils::isSlotBackpack(slot);
auto assemblyPossibilities = art->assemblyPossibilities(hero, assembleEqipped);
// If the artifact can be assembled, display dialog.
@@ -823,7 +819,7 @@ void CArtifactsOfHero::artifactUpdateSlots(const ArtifactLocation & al)
{
if(al.isHolder(curHero))
{
if(al.slot >= GameConstants::BACKPACK_START)
if(ArtifactUtils::isSlotBackpack(al.slot))
updateBackpackSlots();
else
updateWornSlots();
@@ -841,7 +837,7 @@ void CArtifactsOfHero::updateWornSlots(bool redrawParent)
void CArtifactsOfHero::updateBackpackSlots(bool redrawParent)
{
for(auto * artPlace : backpack)
for(auto artPlace : backpack)
updateSlot(artPlace->slotID);
scrollBackpack(0);