games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-03 23:19:22 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/develop' into water_prison_tavern

Browse Source
This commit is contained in:
Tomasz Zieliński
2023-06-14 20:58:02 +02:00
parent a70555a725 46e367bdec
commit f1356dd5bf
56 changed files with 888 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/NetPacksLib.cpp
View File

@@ -1970,13 +1970,14 @@ void AssembledArtifact::applyGs(CGameState *gs)
if(!vstd::contains(combinedArt->artType->possibleSlots[artSet->bearerType()], al.slot)
&& vstd::contains(combinedArt->artType->possibleSlots[artSet->bearerType()], pos))
al.slot = pos;
if(al.slot == pos)
pos = ArtifactPosition::PRE_FIRST;
}
else
{
al.slot = std::min(al.slot, pos);
}
if(al.slot == pos)
pos = ArtifactPosition::PRE_FIRST;
}
combinedArt->addAsConstituent(constituentInstance, pos);
}