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

Merge pull request #2874 from SoundSSGood/exchange-window-update

Browse Source 
Exchange window update
This commit is contained in:
Ivan Savenko
2023-09-27 15:50:52 +03:00
committed by GitHub
parent 71a1ed816a 48ec2d7e2a
commit 97097c20ad
35 changed files with 350 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/CCreatureSet.cpp
View File

@@ -868,14 +868,13 @@ ArtBearer::ArtBearer CStackInstance::bearerType() const
return ArtBearer::CREATURE;
}
void CStackInstance::putArtifact(ArtifactPosition pos, CArtifactInstance * art)
CStackInstance::ArtPlacementMap CStackInstance::putArtifact(ArtifactPosition pos, CArtifactInstance * art)
{
assert(!getArt(pos));
assert(art->artType->canBePutAt(this, pos));
CArtifactSet::putArtifact(pos, art);
if(ArtifactUtils::isSlotEquipment(pos))
attachTo(*art);
attachTo(*art);
return CArtifactSet::putArtifact(pos, art);
}
void CStackInstance::removeArtifact(ArtifactPosition pos)