From cc78eca07666eec99f1a09d809568970e968b52d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 29 Apr 2016 15:27:42 +0300 Subject: Add name into Action memory object. --- src/resources/action.cpp | 3 ++- src/resources/action.h | 6 +++++- src/resources/sprite/spritedef.cpp | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/resources/action.cpp b/src/resources/action.cpp index 85f716b28..a79614eef 100644 --- a/src/resources/action.cpp +++ b/src/resources/action.cpp @@ -28,9 +28,10 @@ #include "debug.h" -Action::Action() noexcept : +Action::Action(const std::string &name) noexcept : MemoryCounter(), mAnimations(), + mCounterName(name), mNumber(100) { } diff --git a/src/resources/action.h b/src/resources/action.h index 6cf4ed0d0..e6762302f 100644 --- a/src/resources/action.h +++ b/src/resources/action.h @@ -39,7 +39,7 @@ class Animation; class Action final : public MemoryCounter { public: - Action() noexcept; + Action(const std::string &name) noexcept; A_DELETE_COPY(Action) @@ -63,12 +63,16 @@ class Action final : public MemoryCounter int calcMemoryChilds(const int level) const override final; + std::string getCounterName() const override + { return mCounterName; } + protected: typedef std::map Animations; typedef Animations::iterator AnimationIter; typedef Animations::const_iterator AnimationCIter; Animations mAnimations; + std::string mCounterName; unsigned mNumber; }; diff --git a/src/resources/sprite/spritedef.cpp b/src/resources/sprite/spritedef.cpp index 066d0b827..a19c1b267 100644 --- a/src/resources/sprite/spritedef.cpp +++ b/src/resources/sprite/spritedef.cpp @@ -275,7 +275,7 @@ void SpriteDef::loadAction(const XmlNodePtr node, actionName.c_str(), getIdPath().c_str()); return; } - Action *const action = new Action; + Action *const action = new Action(actionName); action->setNumber(hp); addAction(hp, actionName, action); -- cgit v1.2.3-70-g09d2