games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Code Issues Releases Activity

Remove few more subID usages

Browse Source
This commit is contained in:
Ivan Savenko
2023-10-26 14:38:21 +03:00
parent 7a09646009
commit cc30bdda04
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/gameState/CGameState.cpp
View File

@ -638,7 +638,7 @@ void CGameState::initHeroes()
hero->initHero(getRandomGenerator()); hero->initHero(getRandomGenerator());
getPlayerState(hero->getOwner())->heroes.push_back(hero); getPlayerState(hero->getOwner())->heroes.push_back(hero);
map->allHeroes[hero->type->getIndex()] = hero; map->allHeroes[hero->getHeroType()] = hero;
} }
// generate boats for all heroes on water // generate boats for all heroes on water
@ -666,7 +666,10 @@ void CGameState::initHeroes()
for(auto obj : map->objects) //prisons for(auto obj : map->objects) //prisons
{ {
if(obj && obj->ID == Obj::PRISON) if(obj && obj->ID == Obj::PRISON)
map->allHeroes[obj->subID] = dynamic_cast<CGHeroInstance*>(obj.get()); {
auto * hero = dynamic_cast<CGHeroInstance*>(obj.get());
map->allHeroes[hero->getHeroType()] = hero;
}
} }
std::set<HeroTypeID> heroesToCreate = getUnusedAllowedHeroes(); //ids of heroes to be created and put into the pool std::set<HeroTypeID> heroesToCreate = getUnusedAllowedHeroes(); //ids of heroes to be created and put into the pool
@ -678,7 +681,7 @@ void CGameState::initHeroes()
heroesPool->addHeroToPool(ph); heroesPool->addHeroToPool(ph);
heroesToCreate.erase(ph->type->getId()); heroesToCreate.erase(ph->type->getId());
map->allHeroes[ph->subID] = ph; map->allHeroes[ph->getHeroType()] = ph;
} }
for(const HeroTypeID & htype : heroesToCreate) //all not used allowed heroes go with default state into the pool for(const HeroTypeID & htype : heroesToCreate) //all not used allowed heroes go with default state into the pool
@ -789,6 +792,7 @@ void CGameState::initTowns()
for (auto & elem : map->towns) for (auto & elem : map->towns)
{ {
CGTownInstance * vti =(elem); CGTownInstance * vti =(elem);
assert(vti->town);
if(!vti->town) if(!vti->town)
{ {
vti->town = (*VLC->townh)[vti->subID]->town; vti->town = (*VLC->townh)[vti->subID]->town;