diff options
Diffstat (limited to 'src/resources/sprite')
| -rw-r--r-- | src/resources/sprite/animatedsprite.h | 26 | ||||
| -rw-r--r-- | src/resources/sprite/imagesprite.h | 22 |
2 files changed, 24 insertions, 24 deletions
diff --git a/src/resources/sprite/animatedsprite.h b/src/resources/sprite/animatedsprite.h index cdf5680eb..dcf8045fb 100644 --- a/src/resources/sprite/animatedsprite.h +++ b/src/resources/sprite/animatedsprite.h @@ -63,47 +63,47 @@ class AnimatedSprite final : public Sprite ~AnimatedSprite(); - bool reset() restrict2 final; + bool reset() restrict2 override final; - bool play(const std::string &restrict action) restrict2 final; + bool play(const std::string &restrict action) restrict2 override final; - bool update(const int time) restrict2 final; + bool update(const int time) restrict2 override final; void draw(Graphics *restrict const graphics, const int posX, - const int posY) const restrict2 final A_NONNULL(2); + const int posY) const restrict2 override final A_NONNULL(2); void drawRaw(Graphics *restrict const graphics, const int posX, const int posY) const restrict2 A_NONNULL(2); - int getWidth() const restrict2 final A_WARN_UNUSED; + int getWidth() const restrict2 override final A_WARN_UNUSED; - int getHeight() const restrict2 final A_WARN_UNUSED; + int getHeight() const restrict2 override final A_WARN_UNUSED; - const Image* getImage() const restrict2 noexcept final + const Image* getImage() const restrict2 noexcept override final A_WARN_UNUSED; bool setSpriteDirection(const SpriteDirection::Type direction) - restrict2 final; + restrict2 override final; int getNumberOfLayers() const restrict2 noexcept A_WARN_UNUSED { return 1; } std::string getIdPath() const restrict2 A_WARN_UNUSED; - unsigned int getCurrentFrame() const restrict2 noexcept final + unsigned int getCurrentFrame() const restrict2 noexcept override final A_WARN_UNUSED { return mFrameIndex; } unsigned int getFrameCount() const - restrict2 final A_WARN_UNUSED; + restrict2 override final A_WARN_UNUSED; - void setAlpha(float alpha) restrict2 final; + void setAlpha(float alpha) restrict2 override final; - const void *getHash() const restrict2 final A_WARN_UNUSED; + const void *getHash() const restrict2 override final A_WARN_UNUSED; - bool updateNumber(const unsigned num) restrict2 final; + bool updateNumber(const unsigned num) restrict2 override final; void clearDelayLoad() restrict2 noexcept { mDelayLoad = nullptr; } diff --git a/src/resources/sprite/imagesprite.h b/src/resources/sprite/imagesprite.h index 21ff03d90..c3fa39fae 100644 --- a/src/resources/sprite/imagesprite.h +++ b/src/resources/sprite/imagesprite.h @@ -37,42 +37,42 @@ class ImageSprite final : public Sprite ~ImageSprite(); - bool reset() final + bool reset() override final { return false; } - bool play(const std::string &action A_UNUSED) final + bool play(const std::string &action A_UNUSED) override final { return false; } - bool update(const int time A_UNUSED) final + bool update(const int time A_UNUSED) override final { return false; } void draw(Graphics *const graphics, const int posX, const int posY) - const final A_NONNULL(2); + const override final A_NONNULL(2); - int getWidth() const final A_WARN_UNUSED + int getWidth() const override final A_WARN_UNUSED { return mImage ? mImage->getWidth() : 0; } - int getHeight() const final A_WARN_UNUSED + int getHeight() const override final A_WARN_UNUSED { return mImage ? mImage->getHeight() : 0; } - const Image* getImage() const final A_WARN_UNUSED + const Image* getImage() const override final A_WARN_UNUSED { return mImage; } bool setSpriteDirection(const SpriteDirection::Type - direction A_UNUSED) final + direction A_UNUSED) override final { return false; } int getNumberOfLayers() const A_WARN_UNUSED { return 1; } - unsigned int getCurrentFrame() const final A_WARN_UNUSED + unsigned int getCurrentFrame() const override final A_WARN_UNUSED { return 0; } - unsigned int getFrameCount() const final A_WARN_UNUSED + unsigned int getFrameCount() const override final A_WARN_UNUSED { return 1; } - bool updateNumber(const unsigned num A_UNUSED) final + bool updateNumber(const unsigned num A_UNUSED) override final { return false; } private: |