games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-01 00:45:26 +02:00
Code Issues Releases Activity

* creature ID refactoring

Browse Source 
* double week creatures are configurable now
This commit is contained in:
mateuszb
2013-02-07 17:34:50 +00:00
parent ed3d35554e
commit f1c78e3260
52 changed files with 420 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Mapping/MapFormatH3M.cpp
View File

@ -747,7 +747,7 @@ void CMapLoaderH3M::readDefInfo()
defInfo->terrainAllowed = reader.readUInt16();
defInfo->terrainMenu = reader.readUInt16();
defInfo->id = reader.readUInt32();
defInfo->id = static_cast<Obj::Obj>(reader.readUInt32());
defInfo->subid = reader.readUInt32();
defInfo->type = reader.readUInt8();
defInfo->printPriority = reader.readUInt8();
@ -984,22 +984,22 @@ void CMapLoaderH3M::readObjects()
{
if(artID != 0xff)
{
cre->gainedArtifact = artID;
cre->gainedArtifact = static_cast<ArtifactID::ArtifactID>(artID);
}
else
{
cre->gainedArtifact = -1;
cre->gainedArtifact = ArtifactID::NONE;
}
}
else
{
if(artID != 0xffff)
{
cre->gainedArtifact = artID;
cre->gainedArtifact = static_cast<ArtifactID::ArtifactID>(artID);
}
else
{
cre->gainedArtifact = -1;
cre->gainedArtifact = ArtifactID::NONE;
}
}
}
@ -1476,16 +1476,16 @@ void CMapLoaderH3M::readCreatureSet(CCreatureSet * out, int number)
for(int ir = 0; ir < number; ++ir)
{
int creID;
CreatureID::CreatureID creID;
int count;
if (version)
{
creID = reader.readUInt16();
creID = static_cast<CreatureID::CreatureID>(reader.readUInt16());
}
else
{
creID = reader.readUInt8();
creID = static_cast<CreatureID::CreatureID>(reader.readUInt8());
}
count = reader.readUInt16();
@ -1498,7 +1498,7 @@ void CMapLoaderH3M::readCreatureSet(CCreatureSet * out, int number)
if(creID > maxID - 0xf)
{
//this will happen when random object has random army
creID = maxID + 1 - creID + VLC->creh->creatures.size();
creID = static_cast<CreatureID::CreatureID>(maxID + 1 - creID + VLC->creh->creatures.size());
hlp->idRand = creID;
}
else