summaryrefslogtreecommitdiff
path: root/src/resources/map/tileset.h
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/tileset.h
parentbbfe142ec3b7879bbd618f36367f95c030d65968 (diff)
downloadmanaverse-f3d00667c5a1bffa5a04d5e86676caca6979b58d.tar.gz
manaverse-f3d00667c5a1bffa5a04d5e86676caca6979b58d.tar.bz2
manaverse-f3d00667c5a1bffa5a04d5e86676caca6979b58d.tar.xz
manaverse-f3d00667c5a1bffa5a04d5e86676caca6979b58d.zip
Fix code style.
Diffstat (limited to 'src/resources/map/tileset.h')
-rw-r--r--src/resources/map/tileset.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/map/tileset.h b/src/resources/map/tileset.h
index c2f4a297c..93ff16c2d 100644
--- a/src/resources/map/tileset.h
+++ b/src/resources/map/tileset.h
@@ -77,15 +77,15 @@ class Tileset final : public ImageSet
int calcMemoryLocal() const override final
{
int sz = ImageSet::calcMemoryLocal() +
- sizeof(Tileset);
+ static_cast<int>(sizeof(Tileset));
const std::map<std::string, std::string>::const_iterator it_end =
mProperties.end();
std::map<std::string, std::string>::const_iterator it =
mProperties.begin();
while (it != it_end)
{
- sz += (*it).first.capacity() +
- (*it).second.capacity();
+ sz += static_cast<int>((*it).first.capacity() +
+ (*it).second.capacity());
++ it;
}
return sz;