diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-04-02 12:26:23 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-04-02 12:26:23 +0300 |
| commit | 124e28787a66fc1ae882afbb5711b08620b51563 (patch) | |
| tree | 5f172652494234e6caae74cf04a2cd4d0083cbf0 /src/particle | |
| parent | 48746ecb8cd94270f143cc7d722188d2e77c3101 (diff) | |
| download | manaplus-124e28787a66fc1ae882afbb5711b08620b51563.tar.gz manaplus-124e28787a66fc1ae882afbb5711b08620b51563.tar.bz2 manaplus-124e28787a66fc1ae882afbb5711b08620b51563.tar.xz manaplus-124e28787a66fc1ae882afbb5711b08620b51563.zip | |
Remove useless virtual keywords.
Diffstat (limited to 'src/particle')
| -rw-r--r-- | src/particle/imageparticle.h | 2 | ||||
| -rw-r--r-- | src/particle/particle.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/particle/imageparticle.h b/src/particle/imageparticle.h index a2fadde7a..ecae08c37 100644 --- a/src/particle/imageparticle.h +++ b/src/particle/imageparticle.h @@ -57,7 +57,7 @@ class ImageParticle notfinal : public Particle const int offsetX, const int offsetY) const override final; - virtual void setAlpha(const float alpha) override final + void setAlpha(const float alpha) override final { mAlpha = alpha; } static StringIntMap imageParticleCountByName; diff --git a/src/particle/particle.h b/src/particle/particle.h index 9925a40a9..ad141ffc7 100644 --- a/src/particle/particle.h +++ b/src/particle/particle.h @@ -100,13 +100,13 @@ class Particle notfinal : public Actor /** * Necessary for sorting with the other sprites. */ - virtual int getPixelY() const override A_WARN_UNUSED + int getPixelY() const override A_WARN_UNUSED { return static_cast<int>(mPos.y) - 16; } /** * Necessary for sorting with the other sprites for sorting only. */ - virtual int getSortPixelY() const override A_WARN_UNUSED + int getSortPixelY() const override A_WARN_UNUSED { return static_cast<int>(mPos.y) - 16; } /** @@ -274,7 +274,7 @@ class Particle notfinal : public Actor float getAlpha() const override final { return 1.0F; } - virtual void setAlpha(const float alpha A_UNUSED) override + void setAlpha(const float alpha A_UNUSED) override { } virtual void setDeathEffect(const std::string &effectFile, |