summaryrefslogtreecommitdiff
path: root/src/particle/imageparticle.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-17 23:06:06 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-17 23:06:56 +0300
commitdba0611175c8d4a56dfbc918ccef139351e5c3e0 (patch)
treeb3c7a5684604facc0f0f5656fe373958c53dc5ad /src/particle/imageparticle.h
parent53530f76275df76406a9ce438a33df78c50d0948 (diff)
downloadmv-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.gz
mv-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.bz2
mv-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.xz
mv-dba0611175c8d4a56dfbc918ccef139351e5c3e0.zip
Revert "Remove override keyword, if it present with final."
This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.
Diffstat (limited to 'src/particle/imageparticle.h')
-rw-r--r--src/particle/imageparticle.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/particle/imageparticle.h b/src/particle/imageparticle.h
index 04395d870..42e01266d 100644
--- a/src/particle/imageparticle.h
+++ b/src/particle/imageparticle.h
@@ -50,9 +50,10 @@ class ImageParticle notfinal : public Particle
*/
void draw(Graphics *restrict const graphics,
const int offsetX,
- const int offsetY) const restrict2 final A_NONNULL(2);
+ const int offsetY) const
+ restrict2 override final A_NONNULL(2);
- void setAlpha(const float alpha) restrict2 final
+ void setAlpha(const float alpha) restrict2 override final
{ mAlpha = alpha; }
static StringIntMap imageParticleCountByName;