diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-04-26 20:11:07 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-04-26 20:11:07 +0300 |
commit | 07675230038a24dd251581591379c8fe5cc7bfd1 (patch) | |
tree | 1e4633730515af717ba93aef111f855de5cc9b38 /src/resources/sprite/spritedef.cpp | |
parent | 17f34f00d37432dae207be3d55ec531a738eb065 (diff) | |
download | manaplus-07675230038a24dd251581591379c8fe5cc7bfd1.tar.gz manaplus-07675230038a24dd251581591379c8fe5cc7bfd1.tar.bz2 manaplus-07675230038a24dd251581591379c8fe5cc7bfd1.tar.xz manaplus-07675230038a24dd251581591379c8fe5cc7bfd1.zip |
Add memory count functions into MapLayer and SpecailLayer.
Also change all memory count functions into const methods.
Diffstat (limited to 'src/resources/sprite/spritedef.cpp')
-rw-r--r-- | src/resources/sprite/spritedef.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/resources/sprite/spritedef.cpp b/src/resources/sprite/spritedef.cpp index ba3abaec9..066d0b827 100644 --- a/src/resources/sprite/spritedef.cpp +++ b/src/resources/sprite/spritedef.cpp @@ -594,7 +594,7 @@ bool SpriteDef::addSequence(const int start, return false; } -int SpriteDef::calcMemoryLocal() +int SpriteDef::calcMemoryLocal() const { int sz = sizeof(SpriteDef) + sizeof(ImageSets) + @@ -608,20 +608,20 @@ int SpriteDef::calcMemoryLocal() return sz; } -int SpriteDef::calcMemoryChilds(const int level) +int SpriteDef::calcMemoryChilds(const int level) const { int sz = 0; - FOR_EACH (ImageSets::iterator, it, mImageSets) + FOR_EACH (ImageSets::const_iterator, it, mImageSets) { sz += (*it).first.capacity(); - ImageSet *const imageSet = (*it).second; + const ImageSet *const imageSet = (*it).second; sz += imageSet->calcMemory(level + 1); } - FOR_EACH (ActionsIter, it, mActions) + FOR_EACH (ActionsCIter, it, mActions) { sz += sizeof(unsigned); - ActionMap *const actionMap = (*it).second; - FOR_EACHP (ActionMap::iterator, it2, actionMap) + const ActionMap *const actionMap = (*it).second; + FOR_EACHP (ActionMap::const_iterator, it2, actionMap) { sz += (*it2).first.capacity(); Action *const action = (*it2).second; |