games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Converted remaining identifier to new system

Browse Source
This commit is contained in:
Ivan Savenko
2023-08-20 00:22:31 +03:00
parent 0240ee886d
commit e54287ea5d
91 changed files with 1590 additions and 1654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/mapping/MapFormatH3M.cpp
View File

@@ -898,7 +898,7 @@ void CMapLoaderH3M::loadArtifactsOfHero(CGHeroInstance * hero)
int amount = reader->readUInt16();
for(int i = 0; i < amount; ++i)
{
loadArtifactToSlot(hero, GameConstants::BACKPACK_START + static_cast<int>(hero->artifactsInBackpack.size()));
loadArtifactToSlot(hero, ArtifactPosition::BACKPACK_START + static_cast<int>(hero->artifactsInBackpack.size()));
}
}
@@ -917,7 +917,7 @@ bool CMapLoaderH3M::loadArtifactToSlot(CGHeroInstance * hero, int slot)
return false;
}
if(art->isBig() && slot >= GameConstants::BACKPACK_START)
if(art->isBig() && slot >= ArtifactPosition::BACKPACK_START)
{
logGlobal->warn("Map '%s': A big artifact (war machine) in hero's backpack, ignoring...", mapName);
return false;
@@ -1652,7 +1652,7 @@ CGObjectInstance * CMapLoaderH3M::readHero(const int3 & mapPosition, const Objec
for(auto & elem : map->disposedHeroes)
{
if(elem.heroId == object->subID)
if(elem.heroId.getNum() == object->subID)
{
object->nameCustom = elem.name;
object->portrait = elem.portrait;