summaryrefslogtreecommitdiff
path: root/src/resources/sprite/spritedef.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/sprite/spritedef.cpp
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/sprite/spritedef.cpp')
-rw-r--r--src/resources/sprite/spritedef.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/resources/sprite/spritedef.cpp b/src/resources/sprite/spritedef.cpp
index e0919b10b..d0985860c 100644
--- a/src/resources/sprite/spritedef.cpp
+++ b/src/resources/sprite/spritedef.cpp
@@ -596,14 +596,14 @@ bool SpriteDef::addSequence(const int start,
int SpriteDef::calcMemoryLocal() const
{
- int sz = sizeof(SpriteDef) +
+ int sz = static_cast<int>(sizeof(SpriteDef) +
sizeof(ImageSets) +
sizeof(Actions) +
- sizeof(std::set<std::string>) +
+ sizeof(std::set<std::string>)) +
Resource::calcMemoryLocal();
FOR_EACH (std::set<std::string>::const_iterator, it, mProcessedFiles)
{
- sz += (*it).capacity();
+ sz += static_cast<int>((*it).capacity());
}
return sz;
}
@@ -613,7 +613,7 @@ int SpriteDef::calcMemoryChilds(const int level) const
int sz = 0;
FOR_EACH (ImageSets::const_iterator, it, mImageSets)
{
- sz += (*it).first.capacity();
+ sz += static_cast<int>((*it).first.capacity());
const ImageSet *const imageSet = (*it).second;
sz += imageSet->calcMemory(level + 1);
}
@@ -623,7 +623,7 @@ int SpriteDef::calcMemoryChilds(const int level) const
const ActionMap *const actionMap = (*it).second;
FOR_EACHP (ActionMap::const_iterator, it2, actionMap)
{
- sz += (*it2).first.capacity();
+ sz += static_cast<int>((*it2).first.capacity());
Action *const action = (*it2).second;
sz += action->calcMemory(level + 1);
}