From dba0611175c8d4a56dfbc918ccef139351e5c3e0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 17 Apr 2016 23:06:06 +0300 Subject: Revert "Remove override keyword, if it present with final." This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d. --- src/net/tmwa/pethandler.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/net/tmwa/pethandler.h') diff --git a/src/net/tmwa/pethandler.h b/src/net/tmwa/pethandler.h index b38ecb6d4..6362151cd 100644 --- a/src/net/tmwa/pethandler.h +++ b/src/net/tmwa/pethandler.h @@ -34,34 +34,34 @@ class PetHandler final : public Net::PetHandler A_DELETE_COPY(PetHandler) void move(const int petId, - const int x, const int y) const final; + const int x, const int y) const override final; void spawn(const Being *const being, const int petId, - const int x, const int y) const final A_CONST; + const int x, const int y) const override final A_CONST; void emote(const uint8_t emoteId, - const int petId) final; + const int petId) override final; - void catchPet(const Being *const being) const final A_CONST; + void catchPet(const Being *const being) const override final A_CONST; - void sendPetMessage(const int data) const final A_CONST; + void sendPetMessage(const int data) const override final A_CONST; - void setName(const std::string &name) const final A_CONST; + void setName(const std::string &name) const override final A_CONST; - void requestStatus() const final A_CONST; + void requestStatus() const override final A_CONST; - void feed() const final A_CONST; + void feed() const override final A_CONST; - void dropLoot() const final A_CONST; + void dropLoot() const override final A_CONST; - void returnToEgg() const final A_CONST; + void returnToEgg() const override final A_CONST; - void unequip() const final A_CONST; + void unequip() const override final A_CONST; - void setDirection(const unsigned char type) const final; + void setDirection(const unsigned char type) const override final; - void startAi(const bool start) const final; + void startAi(const bool start) const override final; protected: int mRandCounter; -- cgit v1.2.3-70-g09d2