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

CArtifact getters setters

Browse Source
This commit is contained in:
SoundSSGood
2023-07-03 23:11:56 +03:00
parent fd9c7352a0
commit 9b5f6ec7cf
22 changed files with 68 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/NetPacksLib.cpp
View File

@ -1949,8 +1949,8 @@ void AssembledArtifact::applyGs(CGameState *gs)
constituentInstance->removeFrom(ArtifactLocation(al.artHolder, pos));
if(combineEquipped)
{
if(!vstd::contains(combinedArt->artType->possibleSlots[artSet->bearerType()], al.slot)
&& vstd::contains(combinedArt->artType->possibleSlots[artSet->bearerType()], pos))
if(!vstd::contains(combinedArt->artType->getPossibleSlots().at(artSet->bearerType()), al.slot)
&& vstd::contains(combinedArt->artType->getPossibleSlots().at(artSet->bearerType()), pos))
al.slot = pos;
if(al.slot == pos)
pos = ArtifactPosition::PRE_FIRST;