diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-04-17 23:06:06 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-04-17 23:06:56 +0300 |
commit | dba0611175c8d4a56dfbc918ccef139351e5c3e0 (patch) | |
tree | b3c7a5684604facc0f0f5656fe373958c53dc5ad /src/being/compoundsprite.h | |
parent | 53530f76275df76406a9ce438a33df78c50d0948 (diff) | |
download | ManaVerse-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.gz ManaVerse-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.bz2 ManaVerse-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.xz ManaVerse-dba0611175c8d4a56dfbc918ccef139351e5c3e0.zip |
Revert "Remove override keyword, if it present with final."
This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.
Diffstat (limited to 'src/being/compoundsprite.h')
-rw-r--r-- | src/being/compoundsprite.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/being/compoundsprite.h b/src/being/compoundsprite.h index d6a5d67fc..71a77e87e 100644 --- a/src/being/compoundsprite.h +++ b/src/being/compoundsprite.h @@ -44,11 +44,11 @@ class CompoundSprite notfinal : public Sprite virtual ~CompoundSprite(); - bool reset() final; + bool reset() override final; - bool play(const std::string &action) final; + bool play(const std::string &action) override final; - bool update(const int time) final; + bool update(const int time) override final; void drawSimple(Graphics *const graphics, const int posX, @@ -64,16 +64,16 @@ class CompoundSprite notfinal : public Sprite */ int getHeight() const override A_WARN_UNUSED; - const Image *getImage() const final A_WARN_UNUSED; + const Image *getImage() const override final A_WARN_UNUSED; bool setSpriteDirection(const SpriteDirection::Type direction) - final; + override final; int getNumberOfLayers() const A_WARN_UNUSED; - unsigned int getCurrentFrame() const final A_WARN_UNUSED; + unsigned int getCurrentFrame() const override final A_WARN_UNUSED; - unsigned int getFrameCount() const final A_WARN_UNUSED; + unsigned int getFrameCount() const override final A_WARN_UNUSED; void addSprite(Sprite *const sprite); @@ -95,7 +95,7 @@ class CompoundSprite notfinal : public Sprite void setAlpha(float alpha) override; - bool updateNumber(const unsigned num) final; + bool updateNumber(const unsigned num) override final; static void setEnableDelay(bool b) { mEnableDelay = b; } |