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

Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1

Browse Source 
Conflicts:
	lib/CMakeLists.txt
	lib/VCMI_lib.cbp
	lib/filesystem/CFileInputStream.cpp
	lib/filesystem/CZipLoader.cpp
	lib/rmg/CRmgTemplateZone.cpp
	vcmi.workspace
This commit is contained in:
AlexVinS
2016-02-08 10:17:25 +03:00
parent 081a20d047 890ae43f55
commit a00dbd3dd1
38 changed files with 512 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/mapObjects/ObjectTemplate.cpp
View File

@ -348,11 +348,18 @@ void ObjectTemplate::writeJson(JsonNode & node, const bool withTerrain) const
ui32 ObjectTemplate::getWidth() const
{
return usedTiles.empty() ? 0 : usedTiles.front().size();
//TODO: Use 2D array
ui32 ret = 0;
for (auto row : usedTiles)
{
ret = std::max<ui32>(ret, row.size());
}
return ret;
}
ui32 ObjectTemplate::getHeight() const
{
//TODO: Use 2D array
return usedTiles.size();
}