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

Fixed #2026

Browse Source
This commit is contained in:
DjWarmonger
2015-03-12 10:08:10 +01:00
parent f894abe494
commit a832b7efee
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/mapObjects/ObjectTemplate.cpp
View File

@ -249,7 +249,11 @@ void ObjectTemplate::readJson(const JsonNode &node)
usedTiles[mask.size() - 1 - i][line.size() - 1 - j] = charToTile(line[j]);
}
printPriority = node["zIndex"].Float();
const JsonNode zindex = node["zIndex"];
if (!zindex.isNull())
printPriority = node["zIndex"].Float();
else
printPriority = 0; //default value
}
ui32 ObjectTemplate::getWidth() const
@ -332,7 +336,7 @@ int3 ObjectTemplate::getBlockMapOffset() const
return int3(w, h, 0);
}
}
return int3(-1,-1,-1);
return int3(0,0,0);
}
bool ObjectTemplate::isVisitableFrom(si8 X, si8 Y) const