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/particle/textparticle.h | |
| parent | 53530f76275df76406a9ce438a33df78c50d0948 (diff) | |
| download | manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.gz manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.bz2 manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.xz manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.zip | |
Revert "Remove override keyword, if it present with final."
This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.
Diffstat (limited to 'src/particle/textparticle.h')
| -rw-r--r-- | src/particle/textparticle.h | 6 |
1 files changed, 3 insertions, 3 deletions
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: |