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 remote-tracking branch 'upstream/develop' into develop

Browse Source
This commit is contained in:
Xilmi
2024-11-21 23:14:03 +01:00
parent 31d4517f17 03273ed324
commit 65f2d0c44e
134 changed files with 2265 additions and 1318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/mapObjects/CGHeroInstance.cpp
View File

@@ -338,7 +338,8 @@ void CGHeroInstance::setHeroType(HeroTypeID heroType)
void CGHeroInstance::initObj(vstd::RNG & rand)
{
updateAppearance();
if (ID == Obj::HERO)
updateAppearance();
}
void CGHeroInstance::initHero(vstd::RNG & rand, const HeroTypeID & SUBID)
@@ -1266,7 +1267,7 @@ void CGHeroInstance::removeSpellbook()
if(hasSpellbook())
{
cb->removeArtifact(ArtifactLocation(this->id, ArtifactPosition::SPELLBOOK));
cb->gameState()->map->removeArtifactInstance(*this, ArtifactPosition::SPELLBOOK);
}
}