diff options
Diffstat (limited to 'src/particle')
| -rw-r--r-- | src/particle/imageparticle.h | 4 | ||||
| -rw-r--r-- | src/particle/particle.h | 4 | ||||
| -rw-r--r-- | src/particle/particlelist.h | 4 | ||||
| -rw-r--r-- | src/particle/particlevector.h | 4 | ||||
| -rw-r--r-- | src/particle/textparticle.h | 6 |
5 files changed, 11 insertions, 11 deletions
diff --git a/src/particle/imageparticle.h b/src/particle/imageparticle.h index 98a0f3d25..fab5dd4b5 100644 --- a/src/particle/imageparticle.h +++ b/src/particle/imageparticle.h @@ -51,9 +51,9 @@ class ImageParticle notfinal : public Particle virtual void draw(Graphics *restrict const graphics, const int offsetX, const int offsetY) const - restrict2 override final A_NONNULL(2); + restrict2 final A_NONNULL(2); - void setAlpha(const float alpha) restrict2 override final + void setAlpha(const float alpha) restrict2 final { mAlpha = alpha; } static StringIntMap imageParticleCountByName; diff --git a/src/particle/particle.h b/src/particle/particle.h index d73de5dcc..510fe5b6a 100644 --- a/src/particle/particle.h +++ b/src/particle/particle.h @@ -224,10 +224,10 @@ class Particle notfinal : public Actor { mAutoDelete = false; } /** We consider particles (at least for now) to be one layer-sprites */ - int getNumberOfLayers() const restrict2 override final + int getNumberOfLayers() const restrict2 final { return 1; } - float getAlpha() const restrict2 override final + float getAlpha() const restrict2 final { return 1.0F; } void setAlpha(const float alpha A_UNUSED) restrict2 override diff --git a/src/particle/particlelist.h b/src/particle/particlelist.h index 3da542b37..7c03a77d1 100644 --- a/src/particle/particlelist.h +++ b/src/particle/particlelist.h @@ -54,9 +54,9 @@ class ParticleList final : public ParticleContainer */ void removeLocally(const Particle *const particle); - void clearLocally() override final; + void clearLocally() final; - void moveTo(const float x, const float y) override final; + void moveTo(const float x, const float y) final; protected: std::list<Particle *> mElements; /**< Contained particle effects */ diff --git a/src/particle/particlevector.h b/src/particle/particlevector.h index 8804991be..b04980773 100644 --- a/src/particle/particlevector.h +++ b/src/particle/particlevector.h @@ -55,9 +55,9 @@ class ParticleVector final : public ParticleContainer */ void delLocally(const int index); - void clearLocally() override final; + void clearLocally() final; - void moveTo(const float x, const float y) override final; + void moveTo(const float x, const float y) final; protected: std::vector<Particle *> mIndexedElements; diff --git a/src/particle/textparticle.h b/src/particle/textparticle.h index e13b2e13c..e95b57583 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 override final A_NONNULL(2); + restrict2 final A_NONNULL(2); // hack to improve text visibility - int getPixelY() const restrict2 override final A_WARN_UNUSED + int getPixelY() const restrict2 final A_WARN_UNUSED { return CAST_S32(mPos.y + mPos.z); } // hack to improve text visibility (for sorting only) - int getSortPixelY() const restrict2 override final A_WARN_UNUSED + int getSortPixelY() const restrict2 final A_WARN_UNUSED { return CAST_S32(mPos.y + mPos.z); } private: |