summaryrefslogtreecommitdiff
path: root/src/particle
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-10-24 12:18:21 +0300
committerAndrei Karas <akaras@inbox.ru>2013-10-24 12:18:21 +0300
commitaf2677411d895573cf9bc225518d6a1a16079863 (patch)
treeea7f4fd07c791ca61617943acab038d19b55b2e0 /src/particle
parent950b1bc690ff36013e5e650572872ee7acd5e942 (diff)
downloadmv-af2677411d895573cf9bc225518d6a1a16079863.tar.gz
mv-af2677411d895573cf9bc225518d6a1a16079863.tar.bz2
mv-af2677411d895573cf9bc225518d6a1a16079863.tar.xz
mv-af2677411d895573cf9bc225518d6a1a16079863.zip
add final keyword to particles files.
Diffstat (limited to 'src/particle')
-rw-r--r--src/particle/animationparticle.h2
-rw-r--r--src/particle/imageparticle.h5
-rw-r--r--src/particle/particle.h3
-rw-r--r--src/particle/particlecontainer.h8
-rw-r--r--src/particle/rotationalparticle.h2
-rw-r--r--src/particle/textparticle.h6
6 files changed, 14 insertions, 12 deletions
diff --git a/src/particle/animationparticle.h b/src/particle/animationparticle.h
index 55f314994..b2a190e08 100644
--- a/src/particle/animationparticle.h
+++ b/src/particle/animationparticle.h
@@ -43,7 +43,7 @@ class AnimationParticle final : public ImageParticle
~AnimationParticle();
- bool update() override;
+ bool update() override final;
private:
SimpleAnimation *mAnimation; /**< Used animation for this particle */
diff --git a/src/particle/imageparticle.h b/src/particle/imageparticle.h
index c05b2316e..daae640ce 100644
--- a/src/particle/imageparticle.h
+++ b/src/particle/imageparticle.h
@@ -54,9 +54,10 @@ class ImageParticle : public Particle
* Draws the particle image
*/
virtual bool draw(Graphics *const graphics,
- const int offsetX, const int offsetY) const override;
+ const int offsetX,
+ const int offsetY) const override final;
- virtual void setAlpha(const float alpha) override
+ virtual void setAlpha(const float alpha) override final
{ mAlpha = alpha; }
static std::map<std::string, int> imageParticleCountByName;
diff --git a/src/particle/particle.h b/src/particle/particle.h
index 42dd31e15..f677ee01b 100644
--- a/src/particle/particle.h
+++ b/src/particle/particle.h
@@ -101,7 +101,8 @@ class Particle : public Actor
* Draws the particle image.
*/
virtual bool draw(Graphics *const graphics,
- const int offsetX, const int offsetY) const override;
+ const int offsetX,
+ const int offsetY) const override;
/**
* Necessary for sorting with the other sprites.
diff --git a/src/particle/particlecontainer.h b/src/particle/particlecontainer.h
index a8921a942..82718d7d1 100644
--- a/src/particle/particlecontainer.h
+++ b/src/particle/particlecontainer.h
@@ -95,9 +95,9 @@ public:
*/
void removeLocally(const Particle *const particle);
- void clearLocally() override;
+ void clearLocally() override final;
- void moveTo(const float x, const float y) override;
+ void moveTo(const float x, const float y) override final;
protected:
std::list<Particle *> mElements; /**< Contained particle effects */
@@ -127,9 +127,9 @@ public:
*/
void delLocally(const int index);
- void clearLocally() override;
+ void clearLocally() override final;
- void moveTo(const float x, const float y) override;
+ void moveTo(const float x, const float y) override final;
protected:
std::vector<Particle *> mIndexedElements;
diff --git a/src/particle/rotationalparticle.h b/src/particle/rotationalparticle.h
index fcc7e4b07..4d7f826de 100644
--- a/src/particle/rotationalparticle.h
+++ b/src/particle/rotationalparticle.h
@@ -43,7 +43,7 @@ class RotationalParticle final : public ImageParticle
~RotationalParticle();
- bool update() override;
+ bool update() override final;
private:
SimpleAnimation *mAnimation; /**< Used animation for this particle */
diff --git a/src/particle/textparticle.h b/src/particle/textparticle.h
index 272f1c6e1..7b63ff259 100644
--- a/src/particle/textparticle.h
+++ b/src/particle/textparticle.h
@@ -41,14 +41,14 @@ class TextParticle final : public Particle
* Draws the particle image.
*/
bool draw(Graphics *const graphics,
- const int offsetX, const int offsetY) const override;
+ const int offsetX, const int offsetY) const override final;
// hack to improve text visibility
- int getPixelY() const override A_WARN_UNUSED
+ int getPixelY() const override final A_WARN_UNUSED
{ return static_cast<int>(mPos.y + mPos.z); }
// hack to improve text visibility (for sorting only)
- int getSortPixelY() const override A_WARN_UNUSED
+ int getSortPixelY() const override final A_WARN_UNUSED
{ return static_cast<int>(mPos.y + mPos.z); }
private: