summaryrefslogtreecommitdiff
path: root/src/resources/animation
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-26 20:11:07 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-26 20:11:07 +0300
commit07675230038a24dd251581591379c8fe5cc7bfd1 (patch)
tree1e4633730515af717ba93aef111f855de5cc9b38 /src/resources/animation
parent17f34f00d37432dae207be3d55ec531a738eb065 (diff)
downloadManaVerse-07675230038a24dd251581591379c8fe5cc7bfd1.tar.gz
ManaVerse-07675230038a24dd251581591379c8fe5cc7bfd1.tar.bz2
ManaVerse-07675230038a24dd251581591379c8fe5cc7bfd1.tar.xz
ManaVerse-07675230038a24dd251581591379c8fe5cc7bfd1.zip
Add memory count functions into MapLayer and SpecailLayer.
Also change all memory count functions into const methods.
Diffstat (limited to 'src/resources/animation')
-rw-r--r--src/resources/animation/animation.cpp6
-rw-r--r--src/resources/animation/animation.h3
2 files changed, 5 insertions, 4 deletions
diff --git a/src/resources/animation/animation.cpp b/src/resources/animation/animation.cpp
index e52b55737..5af1f7dbb 100644
--- a/src/resources/animation/animation.cpp
+++ b/src/resources/animation/animation.cpp
@@ -87,12 +87,12 @@ void Animation::setLastFrameDelay(const int delay) noexcept
}
}
-int Animation::calcMemoryLocal()
+int Animation::calcMemoryLocal() const
{
int sz = sizeof(Animation);
- FOR_EACH (FramesIter, it, mFrames)
+ FOR_EACH (FramesCIter, it, mFrames)
{
- Frame &frame = *it;
+ const Frame &frame = *it;
sz += sizeof(Frame) +
frame.nextAction.capacity();
}
diff --git a/src/resources/animation/animation.h b/src/resources/animation/animation.h
index dc44a3f0d..0c0b7c6e4 100644
--- a/src/resources/animation/animation.h
+++ b/src/resources/animation/animation.h
@@ -76,6 +76,7 @@ class Animation final : public MemoryCounter
typedef std::vector<Frame> Frames;
typedef Frames::iterator FramesIter;
+ typedef Frames::const_iterator FramesCIter;
typedef Frames::reverse_iterator FramesRevIter;
#ifdef UNITTESTS
@@ -83,7 +84,7 @@ class Animation final : public MemoryCounter
{ return mFrames; }
#endif
- int calcMemoryLocal() override final;
+ int calcMemoryLocal() const override final;
/**
* Determines whether the given animation frame is a terminator.