summaryrefslogtreecommitdiff
path: root/src/resources/map/map.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-06 19:18:09 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-06 19:18:09 +0300
commitf3d00667c5a1bffa5a04d5e86676caca6979b58d (patch)
tree8c326bea9dfeee35670ad201f39818fc1a7765bc /src/resources/map/map.cpp
parentbbfe142ec3b7879bbd618f36367f95c030d65968 (diff)
downloadmv-f3d00667c5a1bffa5a04d5e86676caca6979b58d.tar.gz
mv-f3d00667c5a1bffa5a04d5e86676caca6979b58d.tar.bz2
mv-f3d00667c5a1bffa5a04d5e86676caca6979b58d.tar.xz
mv-f3d00667c5a1bffa5a04d5e86676caca6979b58d.zip
Fix code style.
Diffstat (limited to 'src/resources/map/map.cpp')
-rw-r--r--src/resources/map/map.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp
index 51bd7952c..ee4e0dc59 100644
--- a/src/resources/map/map.cpp
+++ b/src/resources/map/map.cpp
@@ -1701,7 +1701,7 @@ void Map::updateConditionLayers() restrict2
int Map::calcMemoryLocal() const
{
- return sizeof(Map) +
+ return static_cast<int>(sizeof(Map) +
mName.capacity() +
sizeof(MetaTile) * mWidth * mHeight +
sizeof(MapLayer*) * (mLayers.capacity() +
@@ -1714,7 +1714,7 @@ int Map::calcMemoryLocal() const
sizeof(ParticleEffectData) * mParticleEffects.capacity() +
sizeof(MapItem) * mMapPortals.capacity() +
(sizeof(TileAnimation) + sizeof(int)) * mTileAnimations.size() +
- sizeof(Tileset*) * mIndexedTilesetsSize;
+ sizeof(Tileset*) * mIndexedTilesetsSize);
}
int Map::calcMemoryChilds(const int level) const