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

Converted creature ID and spell ID to new form

Browse Source
This commit is contained in:
Ivan Savenko
2023-08-19 20:48:28 +03:00
parent ec8d31bbfc
commit 17d3d663ee
33 changed files with 135 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/mapping/MapReaderH3M.cpp
View File

@@ -65,10 +65,10 @@ ArtifactID MapReaderH3M::readArtifact()
else
result = ArtifactID(reader->readUInt8());
if(result == features.artifactIdentifierInvalid)
if(result.getNum() == features.artifactIdentifierInvalid)
return ArtifactID::NONE;
if (result < features.artifactsCount)
if (result.getNum() < features.artifactsCount)
return remapIdentifier(result);
logGlobal->warn("Map contains invalid artifact %d. Will be removed!", result.getNum());
@@ -82,7 +82,7 @@ ArtifactID MapReaderH3M::readArtifact32()
if(result == ArtifactID::NONE)
return ArtifactID::NONE;
if (result < features.artifactsCount)
if (result.getNum() < features.artifactsCount)
return remapIdentifier(result);
logGlobal->warn("Map contains invalid artifact %d. Will be removed!", result.getNum());
@@ -120,17 +120,17 @@ CreatureID MapReaderH3M::readCreature()
else
result = CreatureID(reader->readUInt8());
if(result == features.creatureIdentifierInvalid)
if(result.getNum() == features.creatureIdentifierInvalid)
return CreatureID::NONE;
if(result < features.creaturesCount)
if(result.getNum() < features.creaturesCount)
return remapIdentifier(result);;
// this may be random creature in army/town, to be randomized later
CreatureID randomIndex(result.getNum() - features.creatureIdentifierInvalid - 1);
assert(randomIndex < CreatureID::NONE);
if (randomIndex > -16)
if (randomIndex.getNum() > -16)
return randomIndex;
logGlobal->warn("Map contains invalid creature %d. Will be removed!", result.getNum());
@@ -168,21 +168,21 @@ SecondarySkill MapReaderH3M::readSkill()
SpellID MapReaderH3M::readSpell()
{
SpellID result(readUInt8());
if(result == features.spellIdentifierInvalid)
if(result.getNum() == features.spellIdentifierInvalid)
return SpellID::NONE;
if(result == features.spellIdentifierInvalid - 1)
if(result.getNum() == features.spellIdentifierInvalid - 1)
return SpellID::PRESET;
assert(result < features.spellsCount);
assert(result.getNum() < features.spellsCount);
return remapIdentifier(result);;
}
SpellID MapReaderH3M::readSpell32()
{
SpellID result(readInt32());
if(result == features.spellIdentifierInvalid)
if(result.getNum() == features.spellIdentifierInvalid)
return SpellID::NONE;
assert(result < features.spellsCount);
assert(result.getNum() < features.spellsCount);
return result;
}