summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
Diffstat (limited to 'src/being')
-rw-r--r--src/being/actorsprite.h8
-rw-r--r--src/being/being.h8
-rw-r--r--src/being/compoundsprite.h23
3 files changed, 20 insertions, 19 deletions
diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h
index c633e8119..12af84cda 100644
--- a/src/being/actorsprite.h
+++ b/src/being/actorsprite.h
@@ -130,16 +130,16 @@ class ActorSprite notfinal : public CompoundSprite, public Actor
*/
void setStatusEffectBlock(const int offset, const uint16_t flags);
- virtual void setAlpha(const float alpha) override final
+ void setAlpha(const float alpha) override final
{ CompoundSprite::setAlpha(alpha); }
- virtual float getAlpha() const override final A_WARN_UNUSED
+ float getAlpha() const override final A_WARN_UNUSED
{ return CompoundSprite::getAlpha(); }
- virtual int getWidth() const override A_WARN_UNUSED
+ int getWidth() const override A_WARN_UNUSED
{ return CompoundSprite::getWidth(); }
- virtual int getHeight() const override A_WARN_UNUSED
+ int getHeight() const override A_WARN_UNUSED
{ return CompoundSprite::getHeight(); }
static void load();
diff --git a/src/being/being.h b/src/being/being.h
index 06f957d61..1dc44b986 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -357,7 +357,7 @@ class Being notfinal : public ActorSprite,
/**
* Performs being logic.
*/
- virtual void logic() override;
+ void logic() override;
void petLogic();
@@ -501,13 +501,13 @@ class Being notfinal : public ActorSprite,
/**
* Returns the horizontal size of the current base sprite of the being.
*/
- virtual int getWidth() const override final A_WARN_UNUSED
+ int getWidth() const override final A_WARN_UNUSED
{ return std::max(CompoundSprite::getWidth(), DEFAULT_BEING_WIDTH); }
/**
* Returns the vertical size of the current base sprite of the being.
*/
- virtual int getHeight() const override final A_WARN_UNUSED
+ int getHeight() const override final A_WARN_UNUSED
{ return std::max(CompoundSprite::getHeight(), DEFAULT_BEING_HEIGHT); }
/**
@@ -556,7 +556,7 @@ class Being notfinal : public ActorSprite,
static void load();
- virtual void optionChanged(const std::string &value) override;
+ void optionChanged(const std::string &value) override;
void flashName(const int time);
diff --git a/src/being/compoundsprite.h b/src/being/compoundsprite.h
index 4017e3038..3e48ffdf7 100644
--- a/src/being/compoundsprite.h
+++ b/src/being/compoundsprite.h
@@ -44,29 +44,30 @@ class CompoundSprite notfinal : public Sprite
virtual ~CompoundSprite();
- virtual bool reset() override final;
+ bool reset() override final;
- virtual bool play(const std::string &action) override final;
+ bool play(const std::string &action) override final;
- virtual bool update(const int time) override final;
+ bool update(const int time) override final;
- virtual void draw(Graphics *const graphics,
- const int posX, const int posY) const override;
+ void draw(Graphics *const graphics,
+ const int posX,
+ const int posY) const override;
/**
* Gets the width in pixels of the first sprite in the list.
*/
- virtual int getWidth() const override A_WARN_UNUSED;
+ int getWidth() const override A_WARN_UNUSED;
/**
* Gets the height in pixels of the first sprite in the list.
*/
- virtual int getHeight() const override A_WARN_UNUSED;
+ int getHeight() const override A_WARN_UNUSED;
- virtual const Image *getImage() const override final A_WARN_UNUSED;
+ const Image *getImage() const override final A_WARN_UNUSED;
- virtual bool setSpriteDirection(const SpriteDirection::Type direction)
- override final;
+ bool setSpriteDirection(const SpriteDirection::Type direction)
+ override final;
int getNumberOfLayers() const A_WARN_UNUSED;
@@ -111,7 +112,7 @@ class CompoundSprite notfinal : public Sprite
*/
virtual unsigned int getFrameCount(unsigned int layer) A_WARN_UNUSED;
- virtual void setAlpha(float alpha) override;
+ void setAlpha(float alpha) override;
bool updateNumber(const unsigned num) override final;