summaryrefslogtreecommitdiff
path: root/src/particle
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-09-26 13:54:12 +0300
committerAndrei Karas <akaras@inbox.ru>2013-09-26 14:41:36 +0300
commit851cc4e95093cb7bd1adce99be95a864d68f8d38 (patch)
tree50096efbfea146de63432ca95d1faacdbd62df80 /src/particle
parent476a73f07d4dae7f0cc3c79a44fbd2c2f8c4bf5f (diff)
downloadManaVerse-851cc4e95093cb7bd1adce99be95a864d68f8d38.tar.gz
ManaVerse-851cc4e95093cb7bd1adce99be95a864d68f8d38.tar.bz2
ManaVerse-851cc4e95093cb7bd1adce99be95a864d68f8d38.tar.xz
ManaVerse-851cc4e95093cb7bd1adce99be95a864d68f8d38.zip
remove useless virtual keywords.
Diffstat (limited to 'src/particle')
-rw-r--r--src/particle/animationparticle.h2
-rw-r--r--src/particle/particlecontainer.h16
-rw-r--r--src/particle/rotationalparticle.h2
-rw-r--r--src/particle/textparticle.h8
4 files changed, 14 insertions, 14 deletions
diff --git a/src/particle/animationparticle.h b/src/particle/animationparticle.h
index 182bfa177..3bfdea0b6 100644
--- a/src/particle/animationparticle.h
+++ b/src/particle/animationparticle.h
@@ -43,7 +43,7 @@ class AnimationParticle final : public ImageParticle
~AnimationParticle();
- virtual bool update() override;
+ bool update() override;
private:
SimpleAnimation *mAnimation; /**< Used animation for this particle */
diff --git a/src/particle/particlecontainer.h b/src/particle/particlecontainer.h
index a348f4cef..a8921a942 100644
--- a/src/particle/particlecontainer.h
+++ b/src/particle/particlecontainer.h
@@ -83,7 +83,7 @@ public:
A_DELETE_COPY(ParticleList)
- virtual ~ParticleList();
+ ~ParticleList();
/**
* Takes control of and adds a particle
@@ -95,9 +95,9 @@ public:
*/
void removeLocally(const Particle *const particle);
- virtual void clearLocally() override;
+ void clearLocally() override;
- virtual void moveTo(const float x, const float y) override;
+ void moveTo(const float x, const float y) override;
protected:
std::list<Particle *> mElements; /**< Contained particle effects */
@@ -114,22 +114,22 @@ public:
A_DELETE_COPY(ParticleVector)
- virtual ~ParticleVector();
+ ~ParticleVector();
/**
* Sets a particle at a specified index. Kills the previous particle
* there, if needed.
*/
- virtual void setLocally(const int index, Particle *const particle);
+ void setLocally(const int index, Particle *const particle);
/**
* Removes a particle at a specified index
*/
- virtual void delLocally(const int index);
+ void delLocally(const int index);
- virtual void clearLocally() override;
+ void clearLocally() override;
- virtual void moveTo(const float x, const float y) override;
+ void moveTo(const float x, const float y) override;
protected:
std::vector<Particle *> mIndexedElements;
diff --git a/src/particle/rotationalparticle.h b/src/particle/rotationalparticle.h
index 33289d8c3..a32decb72 100644
--- a/src/particle/rotationalparticle.h
+++ b/src/particle/rotationalparticle.h
@@ -43,7 +43,7 @@ class RotationalParticle final : public ImageParticle
~RotationalParticle();
- virtual bool update() override;
+ bool update() override;
private:
SimpleAnimation *mAnimation; /**< Used animation for this particle */
diff --git a/src/particle/textparticle.h b/src/particle/textparticle.h
index a243e32e0..16dfd9158 100644
--- a/src/particle/textparticle.h
+++ b/src/particle/textparticle.h
@@ -40,15 +40,15 @@ class TextParticle final : public Particle
/**
* Draws the particle image.
*/
- virtual bool draw(Graphics *const graphics,
- const int offsetX, const int offsetY) const override;
+ bool draw(Graphics *const graphics,
+ const int offsetX, const int offsetY) const override;
// hack to improve text visibility
- virtual int getPixelY() const override A_WARN_UNUSED
+ int getPixelY() const override A_WARN_UNUSED
{ return static_cast<int>(mPos.y + mPos.z); }
// hack to improve text visibility (for sorting only)
- virtual int getSortPixelY() const override A_WARN_UNUSED
+ int getSortPixelY() const override A_WARN_UNUSED
{ return static_cast<int>(mPos.y + mPos.z); }
private: