From dba0611175c8d4a56dfbc918ccef139351e5c3e0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 17 Apr 2016 23:06:06 +0300 Subject: Revert "Remove override keyword, if it present with final." This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d. --- src/particle/textparticle.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/particle/textparticle.h') diff --git a/src/particle/textparticle.h b/src/particle/textparticle.h index e95b57583..e13b2e13c 100644 --- a/src/particle/textparticle.h +++ b/src/particle/textparticle.h @@ -44,14 +44,14 @@ class TextParticle final : public Particle void draw(Graphics *restrict const graphics, const int offsetX, const int offsetY) const - restrict2 final A_NONNULL(2); + restrict2 override final A_NONNULL(2); // hack to improve text visibility - int getPixelY() const restrict2 final A_WARN_UNUSED + int getPixelY() const restrict2 override final A_WARN_UNUSED { return CAST_S32(mPos.y + mPos.z); } // hack to improve text visibility (for sorting only) - int getSortPixelY() const restrict2 final A_WARN_UNUSED + int getSortPixelY() const restrict2 override final A_WARN_UNUSED { return CAST_S32(mPos.y + mPos.z); } private: -- cgit v1.2.3-70-g09d2