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-10-11 19:07:56 +02:00
parent 856e1f0ef8 7866179a01
commit 533806df6d
13 changed files with 79 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/mapObjects/CGHeroInstance.cpp
View File

@@ -309,7 +309,11 @@ const CHeroClass * CGHeroInstance::getHeroClass() const
HeroClassID CGHeroInstance::getHeroClassID() const
{
return getHeroType()->heroClass->getId();
auto heroType = getHeroTypeID();
if (heroType.hasValue())
return getHeroType()->heroClass->getId();
else
return HeroClassID();
}
const CHero * CGHeroInstance::getHeroType() const