games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-20 03:29:32 +02:00
Code Issues Releases Activity

Fix initialization of hero type in map editor

Browse Source
This commit is contained in:
Ivan Savenko 2024-10-11 15:01:43 +00:00
parent 115439f16a
commit e221cdccab
2 changed files with 17 additions and 1 deletions
Show Stats 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 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 const CHero * CGHeroInstance::getHeroType() const

12
mapeditor/inspector/inspector.cpp
View File

@ -139,6 +139,18 @@ void Initializer::initialize(CGHeroInstance * o)
o->tempOwner = PlayerColor::NEUTRAL; o->tempOwner = PlayerColor::NEUTRAL;
} }
if(o->ID == Obj::HERO)
{
for(auto const & t : VLC->heroh->objects)
{
if(t->heroClass->getId() == HeroClassID(o->subID))
{
o->subID = t->getId();
break;
}
}
}
if(o->getHeroTypeID().hasValue()) if(o->getHeroTypeID().hasValue())
{ {
o->gender = o->getHeroType()->gender; o->gender = o->getHeroType()->gender;