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

* refactoring, a few intriguing problems remain

Browse Source
This commit is contained in:
mateuszb
2013-02-13 23:55:42 +00:00
parent ceea466f54
commit 9e00090c42
36 changed files with 544 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Mapping/MapFormatH3M.cpp
View File

@ -815,7 +815,7 @@ void CMapLoaderH3M::readObjects()
int3 objPos = readInt3();
int defnum = reader.readUInt32();
int idToBeGiven = map->objects.size();
ObjectInstanceID idToBeGiven = ObjectInstanceID(map->objects.size());
CGDefInfo * defInfo = map->customDefs.at(defnum);
reader.skip(5);
@ -1460,7 +1460,7 @@ void CMapLoaderH3M::readObjects()
nobj->subID = defInfo->subid;
}
nobj->defInfo = defInfo;
assert(idToBeGiven == map->objects.size());
assert(idToBeGiven == ObjectInstanceID(map->objects.size()));
map->objects.push_back(nobj);
if(nobj->ID == Obj::TOWN)
{
@ -1521,7 +1521,7 @@ void CMapLoaderH3M::readCreatureSet(CCreatureSet * out, int number)
out->validTypes(true);
}
CGObjectInstance * CMapLoaderH3M::readHero(int idToBeGiven)
CGObjectInstance * CMapLoaderH3M::readHero(ObjectInstanceID idToBeGiven)
{
CGHeroInstance * nhi = new CGHeroInstance();