games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity

Fixed duplicated hero check - was used too early, before hero type is

Browse Source 
loaded
This commit is contained in:
Ivan Savenko 2024-02-05 21:55:48 +02:00
parent 87059be67b
commit 9e09fe08e1
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/mapObjects/CGHeroInstance.cpp
View File

@ -1524,28 +1524,6 @@ std::string CGHeroInstance::getHeroTypeName() const
void CGHeroInstance::afterAddToMap(CMap * map)
{
if(ID != Obj::RANDOM_HERO)
{
auto existingHero = std::find_if(map->objects.begin(), map->objects.end(), [&](const CGObjectInstance * o) ->bool
{
return o && (o->ID == Obj::HERO || o->ID == Obj::PRISON) && o->subID == subID && o != this;
});
if(existingHero != map->objects.end())
{
if(settings["session"]["editor"].Bool())
{
logGlobal->warn("Hero is already on the map at %s", (*existingHero)->visitablePos().toString());
}
else
{
logGlobal->error("Hero is already on the map at %s", (*existingHero)->visitablePos().toString());
throw std::runtime_error("Hero is already on the map");
}
}
}
if(ID != Obj::PRISON)
{
map->heroesOnMap.emplace_back(this);

15
lib/mapping/MapFormatJson.cpp
View File

@ -1156,6 +1156,21 @@ void CMapLoaderJson::readObjects()
{
return a->getObjTypeIndex() < b->getObjTypeIndex();
});
std::set<HeroTypeID> debugHeroesOnMap;
for (auto const & object : map->objects)
{
if(object->ID != Obj::HERO && object->ID != Obj::PRISON)
continue;
auto * hero = dynamic_cast<const CGHeroInstance *>(object.get());
if (debugHeroesOnMap.count(hero->getHeroType()))
logGlobal->error("Hero is already on the map at %s", hero->visitablePos().toString());
debugHeroesOnMap.insert(hero->getHeroType());
}
}
void CMapLoaderJson::readTranslations()