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

Merge remote-tracking branch 'upstream/develop' into develop

Browse Source
This commit is contained in:
Xilmi
2024-10-01 16:08:57 +02:00
parent 2d783211ce cef7466c71
commit 3d9892f6b3
71 changed files with 2370 additions and 828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/mapObjects/CGHeroInstance.cpp
View File

@ -1179,7 +1179,7 @@ std::string CGHeroInstance::getBiographyTextID() const
return ""; //for random hero
}
CGHeroInstance::ArtPlacementMap CGHeroInstance::putArtifact(ArtifactPosition pos, CArtifactInstance * art)
CGHeroInstance::ArtPlacementMap CGHeroInstance::putArtifact(const ArtifactPosition & pos, CArtifactInstance * art)
{
assert(art->canBePutAt(this, pos));
@ -1188,7 +1188,7 @@ CGHeroInstance::ArtPlacementMap CGHeroInstance::putArtifact(ArtifactPosition pos
return CArtifactSet::putArtifact(pos, art);
}
void CGHeroInstance::removeArtifact(ArtifactPosition pos)
void CGHeroInstance::removeArtifact(const ArtifactPosition & pos)
{
auto art = getArt(pos);
assert(art);
@ -1224,7 +1224,7 @@ void CGHeroInstance::removeSpellbook()
if(hasSpellbook())
{
getArt(ArtifactPosition::SPELLBOOK)->removeFrom(*this, ArtifactPosition::SPELLBOOK);
cb->removeArtifact(ArtifactLocation(this->id, ArtifactPosition::SPELLBOOK));
}
}