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 branch 'develop' into spell

Browse Source
This commit is contained in:
Laserlicht
2024-10-07 12:55:23 +02:00
committed by GitHub
parent 9c6bd20159 07e53b2fdf
commit a826b88641
123 changed files with 2782 additions and 1161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mapping/MapFormatH3M.cpp
View File

@@ -917,7 +917,7 @@ void CMapLoaderH3M::loadArtifactsOfHero(CGHeroInstance * hero)
hero->artifactsInBackpack.clear();
while(!hero->artifactsWorn.empty())
hero->eraseArtSlot(hero->artifactsWorn.begin()->first);
hero->removeArtifact(hero->artifactsWorn.begin()->first);
}
for(int i = 0; i < features.artifactSlotsCount; i++)
@@ -959,7 +959,7 @@ bool CMapLoaderH3M::loadArtifactToSlot(CGHeroInstance * hero, int slot)
if(ArtifactID(artifactID).toArtifact()->canBePutAt(hero, ArtifactPosition(slot)))
{
auto * artifact = ArtifactUtils::createArtifact(artifactID);
artifact->putAt(*hero, ArtifactPosition(slot));
map->putArtifactInstance(*hero, artifact, slot);
map->addNewArtifactInstance(artifact);
}
else