diff options
| -rw-r--r-- | src/being/actorsprite.h | 7 | ||||
| -rw-r--r-- | src/being/being.h | 13 | ||||
| -rw-r--r-- | src/being/compoundsprite.h | 17 | ||||
| -rw-r--r-- | src/being/localplayer.h | 21 | ||||
| -rw-r--r-- | src/being/playerrelations.cpp | 12 |
5 files changed, 37 insertions, 33 deletions
diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h index 84b86d5ec..db1e4a47d 100644 --- a/src/being/actorsprite.h +++ b/src/being/actorsprite.h @@ -89,7 +89,8 @@ public: { return UNKNOWN; } virtual bool draw(Graphics *const graphics, - const int offsetX, const int offsetY) const override; + const int offsetX, + const int offsetY) const override; virtual bool drawSpriteAt(Graphics *const graphics, const int x, const int y) const; @@ -155,10 +156,10 @@ public: */ void setStatusEffectBlock(const int offset, const uint16_t flags); - virtual void setAlpha(const float alpha) override + virtual void setAlpha(const float alpha) override final { CompoundSprite::setAlpha(alpha); } - virtual float getAlpha() const override A_WARN_UNUSED + virtual float getAlpha() const override final A_WARN_UNUSED { return CompoundSprite::getAlpha(); } virtual int getWidth() const override A_WARN_UNUSED diff --git a/src/being/being.h b/src/being/being.h index de160e85d..90a351af0 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -424,7 +424,8 @@ class Being : public ActorSprite, public ConfigListener const BeingInfo *getInfo() const A_WARN_UNUSED { return mInfo; } - TargetCursorSize getTargetCursorSize() const override A_WARN_UNUSED; + TargetCursorSize getTargetCursorSize() const override final + A_WARN_UNUSED; int getTargetOffsetX() const A_WARN_UNUSED { @@ -544,13 +545,13 @@ class Being : public ActorSprite, public ConfigListener /** * Returns the horizontal size of the current base sprite of the being. */ - virtual int getWidth() const override A_WARN_UNUSED + virtual 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 A_WARN_UNUSED + virtual int getHeight() const override final A_WARN_UNUSED { return std::max(CompoundSprite::getHeight(), DEFAULT_BEING_HEIGHT); } /** @@ -587,10 +588,10 @@ class Being : public ActorSprite, public ConfigListener void setState(const uint8_t state); virtual void drawSprites(Graphics *const graphics, - int posX, int posY) const override; + int posX, int posY) const override final; virtual void drawSpritesSDL(Graphics *const graphics, - int posX, int posY) const override; + int posX, int posY) const override final; void drawHpBar(Graphics *const graphics, const int x, const int y, const int maxHP, const int hp, const int damage, @@ -673,7 +674,7 @@ class Being : public ActorSprite, public ConfigListener void talkTo() const; bool draw(Graphics *const graphics, - const int offsetX, const int offsetY) const override; + const int offsetX, const int offsetY) const override final; bool drawSpriteAt(Graphics *const graphics, const int x, const int y) const; diff --git a/src/being/compoundsprite.h b/src/being/compoundsprite.h index 5cdebd6d6..1ffa0edd4 100644 --- a/src/being/compoundsprite.h +++ b/src/being/compoundsprite.h @@ -59,11 +59,11 @@ public: virtual ~CompoundSprite(); - virtual bool reset() override; + virtual bool reset() override final; - virtual bool play(const std::string &action) override; + virtual bool play(const std::string &action) override final; - virtual bool update(const int time) override; + virtual bool update(const int time) override final; virtual bool draw(Graphics *const graphics, const int posX, const int posY) const override; @@ -78,15 +78,16 @@ public: */ virtual int getHeight() const override A_WARN_UNUSED; - virtual const Image *getImage() const override A_WARN_UNUSED; + virtual const Image *getImage() const override final A_WARN_UNUSED; - virtual bool setSpriteDirection(const SpriteDirection direction) override; + virtual bool setSpriteDirection(const SpriteDirection direction) + override final; int getNumberOfLayers() const A_WARN_UNUSED; - unsigned int getCurrentFrame() const override A_WARN_UNUSED; + unsigned int getCurrentFrame() const override final A_WARN_UNUSED; - unsigned int getFrameCount() const override A_WARN_UNUSED; + unsigned int getFrameCount() const override final A_WARN_UNUSED; size_t size() const A_WARN_UNUSED { return mSprites.size(); } @@ -126,7 +127,7 @@ public: virtual void setAlpha(float alpha) override; - bool updateNumber(const unsigned num) override; + bool updateNumber(const unsigned num) override final; static void setEnableDelay(bool b) { mEnableDelay = b; } diff --git a/src/being/localplayer.h b/src/being/localplayer.h index 735c4b58c..712556ea8 100644 --- a/src/being/localplayer.h +++ b/src/being/localplayer.h @@ -44,7 +44,7 @@ class OkDialog; class AwayListener final : public gcn::ActionListener { public: - void action(const gcn::ActionEvent &event) override; + void action(const gcn::ActionEvent &event) override final; }; /** @@ -81,12 +81,12 @@ class LocalPlayer final : public Being, */ ~LocalPlayer(); - void logic() override; + void logic() override final; void slowLogic(); void setAction(const Action &action, - const int attackType = 0) override; + const int attackType = 0) override final; /** * Compute the next pathnode location when walking using keyboard. @@ -101,7 +101,7 @@ class LocalPlayer final : public Being, * Also, when specified, it picks up an item at the end of a path * or attack target. */ - void nextTile() override + void nextTile() override final { nextTile(0); } void nextTile(unsigned char dir); @@ -112,7 +112,8 @@ class LocalPlayer final : public Being, * Called when an ActorSprite has been destroyed. * @param actorSprite the ActorSprite being destroyed. */ - void actorSpriteDestroyed(const ActorSprite &actorSprite) override; + void actorSpriteDestroyed(const ActorSprite &actorSprite) + override final; /** * Gets the attack range. @@ -193,7 +194,7 @@ class LocalPlayer final : public Being, const unsigned char color, const int floorItemId, const unsigned char fail); - int getLevel() const override A_WARN_UNUSED; + int getLevel() const override final A_WARN_UNUSED; /** Tells that the path has been set by mouse. */ void pathSetByMouse() @@ -374,10 +375,10 @@ class LocalPlayer final : public Being, /** * Called when a option (set with config.addListener()) is changed */ - void optionChanged(const std::string &value) override; + void optionChanged(const std::string &value) override final; void processEvent(const Channels channel, - const DepricatedEvent &event) override; + const DepricatedEvent &event) override final; /** * set a following player. @@ -456,7 +457,7 @@ class LocalPlayer final : public Being, void resetYellowBar(); - unsigned char getWalkMask() const override A_WARN_UNUSED; + unsigned char getWalkMask() const override final A_WARN_UNUSED; void saveHomes(); @@ -503,7 +504,7 @@ class LocalPlayer final : public Being, std::string getGameModifiersString(); protected: - void updateCoords() override; + void updateCoords() override final; void handleStatusEffect(StatusEffect *const effect, const int effectId); diff --git a/src/being/playerrelations.cpp b/src/being/playerrelations.cpp index b06539ea0..db9d46314 100644 --- a/src/being/playerrelations.cpp +++ b/src/being/playerrelations.cpp @@ -73,7 +73,7 @@ class PlayerConfSerialiser final : public: ConfigurationObject *writeConfigItem( const std::pair<std::string, PlayerRelation *> &value, - ConfigurationObject *const cobj) const override + ConfigurationObject *const cobj) const override final { if (!cobj || !value.second) return nullptr; @@ -87,7 +87,7 @@ public: std::map<std::string, PlayerRelation *> * readConfigItem(const ConfigurationObject *const cobj, std::map<std::string, PlayerRelation *> - *const container) const override + *const container) const override final { if (!cobj) return container; @@ -468,7 +468,7 @@ public: } void ignore(Being *const being A_UNUSED, - const unsigned int flags A_UNUSED) const override + const unsigned int flags A_UNUSED) const override final { } }; @@ -485,7 +485,7 @@ public: } void ignore(Being *const being, - const unsigned int flags A_UNUSED) const override + const unsigned int flags A_UNUSED) const override final { if (!being) return; @@ -508,7 +508,7 @@ public: } void ignore(Being *const being, - const unsigned int flags A_UNUSED) const override + const unsigned int flags A_UNUSED) const override final { if (!being) return; @@ -531,7 +531,7 @@ public: } void ignore(Being *const being, - const unsigned int flags A_UNUSED) const override + const unsigned int flags A_UNUSED) const override final { if (!being) return; |