diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-04-17 23:06:06 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-04-17 23:06:56 +0300 |
commit | dba0611175c8d4a56dfbc918ccef139351e5c3e0 (patch) | |
tree | b3c7a5684604facc0f0f5656fe373958c53dc5ad /src/net/eathena | |
parent | 53530f76275df76406a9ce438a33df78c50d0948 (diff) | |
download | manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.gz manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.bz2 manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.xz manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.zip |
Revert "Remove override keyword, if it present with final."
This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.
Diffstat (limited to 'src/net/eathena')
33 files changed, 376 insertions, 376 deletions
diff --git a/src/net/eathena/adminhandler.h b/src/net/eathena/adminhandler.h index e7e52f4b2..542fab695 100644 --- a/src/net/eathena/adminhandler.h +++ b/src/net/eathena/adminhandler.h @@ -35,124 +35,124 @@ class AdminHandler final : public Ea::AdminHandler A_DELETE_COPY(AdminHandler) - void announce(const std::string &text) const final; + void announce(const std::string &text) const override final; - void localAnnounce(const std::string &text) const final; + void localAnnounce(const std::string &text) const override final; - void hide(const bool h) const final; + void hide(const bool h) const override final; - void kick(const BeingId playerId) const final; + void kick(const BeingId playerId) const override final; - void kickAll() const final; + void kickAll() const override final; void warp(const std::string &map, - const int x, const int y) const final; + const int x, const int y) const override final; - void resetStats() const final; + void resetStats() const override final; - void resetSkills() const final; + void resetSkills() const override final; - void gotoName(const std::string &name) const final; + void gotoName(const std::string &name) const override final; - void recallName(const std::string &name) const final; + void recallName(const std::string &name) const override final; void mute(const Being *const being, const int type, - const int limit) const final; + const int limit) const override final; - void muteName(const std::string &name) const final; + void muteName(const std::string &name) const override final; - void requestLogin(const Being *const being) const final; + void requestLogin(const Being *const being) const override final; void setTileType(const int x, const int y, - const int type) const final; + const int type) const override final; - void unequipAll(const Being *const being) const final; + void unequipAll(const Being *const being) const override final; - void requestStats(const std::string &name) const final; + void requestStats(const std::string &name) const override final; - void monsterInfo(const std::string &name) const final; + void monsterInfo(const std::string &name) const override final; - void itemInfo(const std::string &name) const final; + void itemInfo(const std::string &name) const override final; - void whoDrops(const std::string &name) const final; + void whoDrops(const std::string &name) const override final; - void mobSearch(const std::string &name) const final; + void mobSearch(const std::string &name) const override final; - void mobSpawnSearch(const std::string &name) const final; + void mobSpawnSearch(const std::string &name) const override final; - void playerGmCommands(const std::string &name) const final; + void playerGmCommands(const std::string &name) const override final; void playerCharGmCommands(const std::string &name) const - final; + override final; - void showLevel(const std::string &name) const final; + void showLevel(const std::string &name) const override final; - void showStats(const std::string &name) const final; + void showStats(const std::string &name) const override final; - void showStorageList(const std::string &name) const final; + void showStorageList(const std::string &name) const override final; - void showCartList(const std::string &name) const final; + void showCartList(const std::string &name) const override final; - void showInventoryList(const std::string &name) const final; + void showInventoryList(const std::string &name) const override final; - void locatePlayer(const std::string &name) const final; + void locatePlayer(const std::string &name) const override final; - void showAccountInfo(const std::string &name) const final; + void showAccountInfo(const std::string &name) const override final; - void spawnSlave(const std::string &name) const final; + void spawnSlave(const std::string &name) const override final; - void spawnClone(const std::string &name) const final; + void spawnClone(const std::string &name) const override final; - void spawnSlaveClone(const std::string &name) const final; + void spawnSlaveClone(const std::string &name) const override final; - void spawnEvilClone(const std::string &name) const final; + void spawnEvilClone(const std::string &name) const override final; - void savePosition(const std::string &name) const final; + void savePosition(const std::string &name) const override final; - void loadPosition(const std::string &name) const final; + void loadPosition(const std::string &name) const override final; - void randomWarp(const std::string &name) const final; + void randomWarp(const std::string &name) const override final; - void gotoNpc(const std::string &name) const final; + void gotoNpc(const std::string &name) const override final; - void killer(const std::string &name) const final; + void killer(const std::string &name) const override final; - void killable(const std::string &name) const final; + void killable(const std::string &name) const override final; - void heal(const std::string &name) const final; + void heal(const std::string &name) const override final; - void alive(const std::string &name) const final; + void alive(const std::string &name) const override final; - void disguise(const std::string &name) const final; + void disguise(const std::string &name) const override final; - void immortal(const std::string &name) const final; + void immortal(const std::string &name) const override final; - void hide(const std::string &name) const final; + void hide(const std::string &name) const override final; - void nuke(const std::string &name) const final; + void nuke(const std::string &name) const override final; - void kill(const std::string &name) const final; + void kill(const std::string &name) const override final; - void jail(const std::string &name) const final; + void jail(const std::string &name) const override final; - void unjail(const std::string &name) const final; + void unjail(const std::string &name) const override final; void npcMove(const std::string &name, const int x, - const int y) const final; + const int y) const override final; - void hideNpc(const std::string &name) const final; + void hideNpc(const std::string &name) const override final; - void showNpc(const std::string &name) const final; + void showNpc(const std::string &name) const override final; - void changePartyLeader(const std::string &name) const final; + void changePartyLeader(const std::string &name) const override final; - void partyRecall(const std::string &name) const final; + void partyRecall(const std::string &name) const override final; - void breakGuild(const std::string &name) const final; + void breakGuild(const std::string &name) const override final; - void guildRecall(const std::string &name) const final; + void guildRecall(const std::string &name) const override final; protected: static std::string mStatsName; diff --git a/src/net/eathena/auctionhandler.h b/src/net/eathena/auctionhandler.h index 2ab72e9f4..b7c15125f 100644 --- a/src/net/eathena/auctionhandler.h +++ b/src/net/eathena/auctionhandler.h @@ -34,30 +34,30 @@ class AuctionHandler final : public Net::AuctionHandler A_DELETE_COPY(AuctionHandler) - void cancelReg() const final; + void cancelReg() const override final; void setItem(const Item *const item, - const int amount) const final; + const int amount) const override final; void reg(const int currentPrice, const int maxPrice, - const int hours) const final; + const int hours) const override final; - void cancel(const int auctionId) const final; + void cancel(const int auctionId) const override final; - void close(const int auctionId) const final; + void close(const int auctionId) const override final; void bid(const int auctionId, - const int money) const final; + const int money) const override final; void search(const AuctionSearchTypeT type, const int auctionId, const std::string &text, - const int page) const final; + const int page) const override final; - void buy() const final; + void buy() const override final; - void sell() const final; + void sell() const override final; }; } // namespace EAthena diff --git a/src/net/eathena/bankhandler.h b/src/net/eathena/bankhandler.h index c8fc6f6f3..252620045 100644 --- a/src/net/eathena/bankhandler.h +++ b/src/net/eathena/bankhandler.h @@ -34,15 +34,15 @@ class BankHandler final : public Net::BankHandler A_DELETE_COPY(BankHandler) - void deposit(const int money) const final; + void deposit(const int money) const override final; - void withdraw(const int money) const final; + void withdraw(const int money) const override final; - void check() const final; + void check() const override final; - void open() const final; + void open() const override final; - void close() const final; + void close() const override final; }; } // namespace EAthena diff --git a/src/net/eathena/battlegroundhandler.h b/src/net/eathena/battlegroundhandler.h index 0d9f80f19..b87420d3f 100644 --- a/src/net/eathena/battlegroundhandler.h +++ b/src/net/eathena/battlegroundhandler.h @@ -35,15 +35,15 @@ class BattleGroundHandler final : public Net::BattleGroundHandler A_DELETE_COPY(BattleGroundHandler) void registerBg(const BattleGroundTypeT &type, - const std::string &name) const final; + const std::string &name) const override final; - void rekoveRequest(const std::string &name) const final; + void rekoveRequest(const std::string &name) const override final; void beginAck(const bool result, const std::string &bgName, - const std::string &gameName) const final; + const std::string &gameName) const override final; - void checkState(const std::string &name) const final; + void checkState(const std::string &name) const override final; }; } // namespace EAthena diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h index 9cae51a4b..439530dbd 100644 --- a/src/net/eathena/beinghandler.h +++ b/src/net/eathena/beinghandler.h @@ -35,16 +35,16 @@ class BeingHandler final : public Ea::BeingHandler A_DELETE_COPY(BeingHandler) - void requestNameById(const BeingId id) const final; + void requestNameById(const BeingId id) const override final; - void undress(Being *const being) const final; + void undress(Being *const being) const override final; - void requestRanks(const RankT rank) const final; + void requestRanks(const RankT rank) const override final; - void requestNameByCharId(const int id) const final; + void requestNameByCharId(const int id) const override final; void viewPlayerEquipment(const Being *const being) const - final; + override final; }; } // namespace EAthena diff --git a/src/net/eathena/buyingstorehandler.h b/src/net/eathena/buyingstorehandler.h index 93bda3e9e..f271dc60d 100644 --- a/src/net/eathena/buyingstorehandler.h +++ b/src/net/eathena/buyingstorehandler.h @@ -37,16 +37,16 @@ class BuyingStoreHandler final : public Net::BuyingStoreHandler void create(const std::string &name, const int maxMoney, const bool flag, - const std::vector<ShopItem*> &items) const final; + const std::vector<ShopItem*> &items) const override final; - void close() const final; + void close() const override final; - void open(const Being *const being) const final; + void open(const Being *const being) const override final; void sell(const Being *const being, const int storeId, const Item *const item, - const int amount) const final; + const int amount) const override final; }; } // namespace EAthena diff --git a/src/net/eathena/buysellhandler.h b/src/net/eathena/buysellhandler.h index 3436e1ce8..c0bb57600 100644 --- a/src/net/eathena/buysellhandler.h +++ b/src/net/eathena/buysellhandler.h @@ -36,20 +36,20 @@ class BuySellHandler final : public Ea::BuySellHandler A_DELETE_COPY(BuySellHandler) void requestSellList(const std::string &nick) - const final A_CONST; + const override final A_CONST; void requestBuyList(const std::string &nick) - const final A_CONST; + const override final A_CONST; void sendBuyRequest(const std::string &nick, const ShopItem *const item, - const int amount) const final A_CONST; + const int amount) const override final A_CONST; void sendSellRequest(const std::string &nick, const ShopItem *const item, - const int amount) const final A_CONST; + const int amount) const override final A_CONST; - void close() const final; + void close() const override final; }; } // namespace EAthena diff --git a/src/net/eathena/cashshophandler.h b/src/net/eathena/cashshophandler.h index 059347d36..7d7fe1fbc 100644 --- a/src/net/eathena/cashshophandler.h +++ b/src/net/eathena/cashshophandler.h @@ -37,18 +37,18 @@ class CashShopHandler final : public Net::CashShopHandler void buyItem(const int points, const int itemId, const ItemColor color, - const int amount) const final; + const int amount) const override final; - void buyItems(const std::vector<ShopItem*> &items) const final + void buyItems(const std::vector<ShopItem*> &items) const override final A_CONST; - void close() const final; + void close() const override final; - void requestPoints() const final; + void requestPoints() const override final; - void requestTab(const int tab) const final; + void requestTab(const int tab) const override final; - void schedule() const final; + void schedule() const override final; }; } // namespace EAthena diff --git a/src/net/eathena/charserverhandler.h b/src/net/eathena/charserverhandler.h index 8eee59a20..833c5d6ad 100644 --- a/src/net/eathena/charserverhandler.h +++ b/src/net/eathena/charserverhandler.h @@ -39,7 +39,7 @@ class CharServerHandler final : public Ea::CharServerHandler A_DELETE_COPY(CharServerHandler) void chooseCharacter(Net::Character *const character) const - final; + override final; void newCharacter(const std::string &name, const int slot, @@ -48,21 +48,21 @@ class CharServerHandler final : public Ea::CharServerHandler const int hairColor, const unsigned char race, const uint16_t look, - const std::vector<int> &stats) const final; + const std::vector<int> &stats) const override final; void renameCharacter(const BeingId id, - const std::string &newName) const final; + const std::string &newName) const override final; void deleteCharacter(Net::Character *const character, - const std::string &email) const final; + const std::string &email) const override final; - void switchCharacter() const final; + void switchCharacter() const override final; - void connect() const final; + void connect() const override final; - bool isNeedCreatePin() const final A_WARN_UNUSED; + bool isNeedCreatePin() const override final A_WARN_UNUSED; - void setNewPincode(const std::string &pin) const final + void setNewPincode(const std::string &pin) const override final A_CONST; /** @@ -71,14 +71,14 @@ class CharServerHandler final : public Ea::CharServerHandler * the dialog when a new character failed to be created. */ void setCharCreateDialog(CharCreateDialog *const window) const - final; + override final; void changeSlot(const int oldSlot, - const int newSlot) const final; + const int newSlot) const override final; - void ping() const final; + void ping() const override final; - unsigned int hatSprite() const final A_CONST A_WARN_UNUSED; + unsigned int hatSprite() const override final A_CONST A_WARN_UNUSED; }; } // namespace EAthena diff --git a/src/net/eathena/chathandler.h b/src/net/eathena/chathandler.h index 20af47efd..f8356a84d 100644 --- a/src/net/eathena/chathandler.h +++ b/src/net/eathena/chathandler.h @@ -37,59 +37,59 @@ class ChatHandler final : public Ea::ChatHandler A_DELETE_COPY(ChatHandler) void talk(const std::string &restrict text, - const std::string &restrict channel) const final; + const std::string &restrict channel) const override final; - void talkRaw(const std::string &text) const final; + void talkRaw(const std::string &text) const override final; void privateMessage(const std::string &restrict recipient, const std::string &restrict text) const - final; + override final; void channelMessage(const std::string &restrict channel, const std::string &restrict text) const - final; + override final; - void joinChannel(const std::string &channel) const final; + void joinChannel(const std::string &channel) const override final; - void who() const final; + void who() const override final; - void sendRaw(const std::string &args) const final; + void sendRaw(const std::string &args) const override final; - void ignoreAll() const final; + void ignoreAll() const override final; - void unIgnoreAll() const final; + void unIgnoreAll() const override final; void createChatRoom(const std::string &title, const std::string &password, const int limit, - const bool isPublic) const final; + const bool isPublic) const override final; - void ignore(const std::string &nick) const final; + void ignore(const std::string &nick) const override final; - void unIgnore(const std::string &nick) const final; + void unIgnore(const std::string &nick) const override final; - void requestIgnoreList() const final; + void requestIgnoreList() const override final; - void battleTalk(const std::string &text) const final; + void battleTalk(const std::string &text) const override final; void joinChat(const ChatObject *const chat, - const std::string &password) const final; + const std::string &password) const override final; - void partChannel(const std::string &channel) const final; + void partChannel(const std::string &channel) const override final; void talkPet(const std::string &restrict text, - const std::string &restrict channel) const final; + const std::string &restrict channel) const override final; - void leaveChatRoom() const final; + void leaveChatRoom() const override final; void setChatRoomOptions(const int limit, const bool isPublic, const std::string &password, - const std::string &title) const final; + const std::string &title) const override final; - void setChatRoomOwner(const std::string &nick) const final; + void setChatRoomOwner(const std::string &nick) const override final; - void kickFromChatRoom(const std::string &nick) const final; + void kickFromChatRoom(const std::string &nick) const override final; protected: static void processRaw(MessageOut &restrict outMsg, diff --git a/src/net/eathena/familyhandler.h b/src/net/eathena/familyhandler.h index 365dce5fc..0865dcdf9 100644 --- a/src/net/eathena/familyhandler.h +++ b/src/net/eathena/familyhandler.h @@ -34,9 +34,9 @@ class FamilyHandler final : public Net::FamilyHandler A_DELETE_COPY(FamilyHandler) - void askForChild(const Being *const being) const final; + void askForChild(const Being *const being) const override final; - void askForChildReply(const bool accept) const final; + void askForChildReply(const bool accept) const override final; }; } // namespace EAthena diff --git a/src/net/eathena/friendshandler.h b/src/net/eathena/friendshandler.h index 8264ab7ce..ac1e8f3d1 100644 --- a/src/net/eathena/friendshandler.h +++ b/src/net/eathena/friendshandler.h @@ -34,14 +34,14 @@ class FriendsHandler final : public Net::FriendsHandler A_DELETE_COPY(FriendsHandler) - void invite(const std::string &name) const final; + void invite(const std::string &name) const override final; void inviteResponse(const int accountId, const int charId, - const bool accept) const final; + const bool accept) const override final; void remove(const int accountId, - const int charId) const final; + const int charId) const override final; }; } // namespace EAthena diff --git a/src/net/eathena/gamehandler.h b/src/net/eathena/gamehandler.h index 6d3900f33..3d10124d7 100644 --- a/src/net/eathena/gamehandler.h +++ b/src/net/eathena/gamehandler.h @@ -35,21 +35,21 @@ class GameHandler final : public Ea::GameHandler A_DELETE_COPY(GameHandler) - void connect() const final; + void connect() const override final; - bool isConnected() const final A_WARN_UNUSED; + bool isConnected() const override final A_WARN_UNUSED; - void disconnect() const final; + void disconnect() const override final; - void quit() const final; + void quit() const override final; - void ping(const int tick) const final; + void ping(const int tick) const override final; - void disconnect2() const final A_CONST; + void disconnect2() const override final A_CONST; - void mapLoadedEvent() const final; + void mapLoadedEvent() const override final; - bool mustPing() const final A_WARN_UNUSED + bool mustPing() const override final A_WARN_UNUSED { return true; } }; diff --git a/src/net/eathena/generalhandler.h b/src/net/eathena/generalhandler.h index b1666c7bb..7ff2ea34a 100644 --- a/src/net/eathena/generalhandler.h +++ b/src/net/eathena/generalhandler.h @@ -72,23 +72,23 @@ class GeneralHandler final : public Net::GeneralHandler ~GeneralHandler(); - void load() const final; + void load() const override final; - void reload() const final; + void reload() const override final; - void unload() const final; + void unload() const override final; - void flushNetwork() const final; + void flushNetwork() const override final; - void flushSend() const final; + void flushSend() const override final; - void clearHandlers() const final; + void clearHandlers() const override final; - void reloadPartially() const final; + void reloadPartially() const override final; - void gameStarted() const final; + void gameStarted() const override final; - void gameEnded() const final; + void gameEnded() const override final; protected: AdminHandler *mAdminHandler; diff --git a/src/net/eathena/guildhandler.h b/src/net/eathena/guildhandler.h index 504b88676..3ff9d5042 100644 --- a/src/net/eathena/guildhandler.h +++ b/src/net/eathena/guildhandler.h @@ -36,57 +36,57 @@ class GuildHandler final : public Ea::GuildHandler ~GuildHandler(); - void create(const std::string &name) const final; + void create(const std::string &name) const override final; - void invite(const std::string &name) const final; + void invite(const std::string &name) const override final; - void invite(const Being *const being) const final; + void invite(const Being *const being) const override final; void inviteResponse(const int guildId, - const bool response) const final; + const bool response) const override final; - void leave(const int guildId) const final; + void leave(const int guildId) const override final; void kick(const GuildMember *restrict const member, - const std::string &restrict reason) const final; + const std::string &restrict reason) const override final; - void chat(const std::string &text) const final; + void chat(const std::string &text) const override final; - void memberList() const final; + void memberList() const override final; - void info() const final; + void info() const override final; void changeMemberPostion(const GuildMember *const member, - const int level) const final; + const int level) const override final; void changeNotice(const int guildId, const std::string &restrict msg1, const std::string &restrict msg2) - const final; + const override final; - void checkMaster() const final; + void checkMaster() const override final; - void requestAlliance(const Being *const being) const final; + void requestAlliance(const Being *const being) const override final; void requestAllianceResponse(const int beingId, - const bool accept) const final; + const bool accept) const override final; void endAlliance(const int guildId, - const int flag) const final; + const int flag) const override final; void changePostionInfo(const int posId, const int mode, const int ranking, const int payRate, - const std::string &name) const final; + const std::string &name) const override final; - void requestOpposition(const Being *const being) const final; + void requestOpposition(const Being *const being) const override final; - void breakGuild(const std::string &name) const final; + void breakGuild(const std::string &name) const override final; - void changeEmblem(std::string emblem) const final; + void changeEmblem(std::string emblem) const override final; - void requestEmblem(const int guildId) const final; + void requestEmblem(const int guildId) const override final; }; } // namespace EAthena diff --git a/src/net/eathena/homunculushandler.h b/src/net/eathena/homunculushandler.h index fd08c4788..e1262f6e9 100644 --- a/src/net/eathena/homunculushandler.h +++ b/src/net/eathena/homunculushandler.h @@ -34,24 +34,24 @@ class HomunculusHandler final : public Net::HomunculusHandler A_DELETE_COPY(HomunculusHandler) - void setName(const std::string &name) const final; + void setName(const std::string &name) const override final; - void moveToMaster() const final; + void moveToMaster() const override final; - void move(const int x, const int y) const final; + void move(const int x, const int y) const override final; void attack(const BeingId targetId, - const Keep keep) const final; + const Keep keep) const override final; - void feed() const final; + void feed() const override final; - void fire() const final; + void fire() const override final; - void talk(const std::string &restrict text) const final; + void talk(const std::string &restrict text) const override final; - void emote(const uint8_t emoteId) const final; + void emote(const uint8_t emoteId) const override final; - void setDirection(const unsigned char type) const final; + void setDirection(const unsigned char type) const override final; }; } // namespace EAthena diff --git a/src/net/eathena/inventoryhandler.h b/src/net/eathena/inventoryhandler.h index cc19774ac..786917970 100644 --- a/src/net/eathena/inventoryhandler.h +++ b/src/net/eathena/inventoryhandler.h @@ -37,49 +37,49 @@ class InventoryHandler final : public Ea::InventoryHandler ~InventoryHandler(); - void equipItem(const Item *const item) const final; + void equipItem(const Item *const item) const override final; - void unequipItem(const Item *const item) const final; + void unequipItem(const Item *const item) const override final; - void useItem(const Item *const item) const final; + void useItem(const Item *const item) const override final; void dropItem(const Item *const item, - const int amount) const final; + const int amount) const override final; - void closeStorage() const final; + void closeStorage() const override final; void moveItem2(const InventoryTypeT source, const int slot, const int amount, - const InventoryTypeT destination) const final; + const InventoryTypeT destination) const override final; - void useCard(const Item *const item) final; + void useCard(const Item *const item) override final; void insertCard(const int cardIndex, - const int itemIndex) const final; + const int itemIndex) const override final; void favoriteItem(const Item *const item, - const bool favorite) const final; + const bool favorite) const override final; - void selectEgg(const Item *const item) const final; + void selectEgg(const Item *const item) const override final; int convertFromServerSlot(const int serverSlot) - const final A_WARN_UNUSED; + const override final A_WARN_UNUSED; void selectCart(const BeingId accountId, - const int type) const final; + const int type) const override final; - void identifyItem(const Item *const item) const final; + void identifyItem(const Item *const item) const override final; void mergeItemsAck(const std::vector<Item*> &items) const - final; + override final; - void mergetItemsCancel() const final; + void mergetItemsCancel() const override final; - int getProjectileSlot() const final + int getProjectileSlot() const override final { return 23; } - int getItemIndex() const final A_WARN_UNUSED + int getItemIndex() const override final A_WARN_UNUSED { return mItemIndex; } private: diff --git a/src/net/eathena/loginhandler.h b/src/net/eathena/loginhandler.h index 815af77d9..b564b1b27 100644 --- a/src/net/eathena/loginhandler.h +++ b/src/net/eathena/loginhandler.h @@ -37,32 +37,32 @@ class LoginHandler final : public Ea::LoginHandler ~LoginHandler(); - void connect() const final; + void connect() const override final; - bool isConnected() const final A_WARN_UNUSED; + bool isConnected() const override final A_WARN_UNUSED; - void disconnect() const final; + void disconnect() const override final; - unsigned int getMaxPasswordLength() const final A_WARN_UNUSED + unsigned int getMaxPasswordLength() const override final A_WARN_UNUSED { return 24; } void changePassword(const std::string &restrict oldPassword, const std::string &restrict newPassword) - const final; + const override final; - void sendVersion() const final; + void sendVersion() const override final; - ServerInfo *getCharServer() const final A_WARN_UNUSED; + ServerInfo *getCharServer() const override final A_WARN_UNUSED; - void ping() const final; + void ping() const override final; - void updatePacketVersion() const final; + void updatePacketVersion() const override final; private: void sendLoginRegister(const std::string &restrict username, const std::string &restrict password, const std::string &restrict email) - const final; + const override final; }; } // namespace EAthena diff --git a/src/net/eathena/mailhandler.h b/src/net/eathena/mailhandler.h index a27f739d9..44f68d7be 100644 --- a/src/net/eathena/mailhandler.h +++ b/src/net/eathena/mailhandler.h @@ -33,25 +33,25 @@ class MailHandler final : public Net::MailHandler A_DELETE_COPY(MailHandler) - void refresh() const final; + void refresh() const override final; - void readMessage(const int msgId) const final; + void readMessage(const int msgId) const override final; - void getAttach(const int msgId) const final; + void getAttach(const int msgId) const override final; - void deleteMessage(const int msgId) const final; + void deleteMessage(const int msgId) const override final; - void returnMessage(const int msgId) const final; + void returnMessage(const int msgId) const override final; - void setAttach(const int index, const int amount) const final; + void setAttach(const int index, const int amount) const override final; - void setAttachMoney(const int money) const final; + void setAttachMoney(const int money) const override final; - void resetAttach(const int flag) const final; + void resetAttach(const int flag) const override final; void send(const std::string &name, const std::string &title, - std::string message) const final; + std::string message) const override final; }; } // namespace EAthena diff --git a/src/net/eathena/markethandler.h b/src/net/eathena/markethandler.h index f1cc3d6a4..fd0d4aea5 100644 --- a/src/net/eathena/markethandler.h +++ b/src/net/eathena/markethandler.h @@ -33,15 +33,15 @@ class MarketHandler final : public Net::MarketHandler A_DELETE_COPY(MarketHandler) - void close() const final; + void close() const override final; void buyItem(const int itemId, const ItemTypeT type, const ItemColor color, - const int amount) const final; + const int amount) const override final; void buyItems(const std::vector<ShopItem*> &items) const - final; + override final; }; } // namespace EAthena diff --git a/src/net/eathena/mercenaryhandler.h b/src/net/eathena/mercenaryhandler.h index 71994d9dc..d6eddd75b 100644 --- a/src/net/eathena/mercenaryhandler.h +++ b/src/net/eathena/mercenaryhandler.h @@ -32,20 +32,20 @@ class MercenaryHandler final : public Net::MercenaryHandler A_DELETE_COPY(MercenaryHandler) - void fire() const final; + void fire() const override final; - void moveToMaster() const final; + void moveToMaster() const override final; - void move(const int x, const int y) const final; + void move(const int x, const int y) const override final; void attack(const BeingId targetId, - const Keep keep) const final; + const Keep keep) const override final; - void talk(const std::string &restrict text) const final; + void talk(const std::string &restrict text) const override final; - void emote(const uint8_t emoteId) const final; + void emote(const uint8_t emoteId) const override final; - void setDirection(const unsigned char type) const final; + void setDirection(const unsigned char type) const override final; }; } // namespace EAthena diff --git a/src/net/eathena/messagein.h b/src/net/eathena/messagein.h index e0cbe7fc2..5ba13ea9c 100644 --- a/src/net/eathena/messagein.h +++ b/src/net/eathena/messagein.h @@ -50,13 +50,13 @@ class MessageIn final : public Net::MessageIn const unsigned int version); /**< Reads a short. */ - int16_t readInt16(const char *const str) final; + int16_t readInt16(const char *const str) override final; /**< Reads a long. */ - int32_t readInt32(const char *const str) final; + int32_t readInt32(const char *const str) override final; - int64_t readInt64(const char *const str) final; + int64_t readInt64(const char *const str) override final; - BeingId readBeingId(const char *const str) final; + BeingId readBeingId(const char *const str) override final; uint16_t readId() const; }; diff --git a/src/net/eathena/messageout.h b/src/net/eathena/messageout.h index 415016403..83f9fbe7f 100644 --- a/src/net/eathena/messageout.h +++ b/src/net/eathena/messageout.h @@ -49,14 +49,14 @@ class MessageOut final : public Net::MessageOut /**< Writes a short. */ void writeInt16(const int16_t value, - const char *const str) final; + const char *const str) override final; /**< Writes a long. */ void writeInt32(const int32_t value, - const char *const str) final; + const char *const str) override final; void writeBeingId(const BeingId value, - const char *const str) final; + const char *const str) override final; /** * Encodes coordinates and direction in 3 bytes. @@ -70,7 +70,7 @@ class MessageOut final : public Net::MessageOut { mPos = 0; } private: - void expand(const size_t size) const final; + void expand(const size_t size) const override final; Network *mNetwork; }; diff --git a/src/net/eathena/npchandler.h b/src/net/eathena/npchandler.h index 269745aa8..049d69a72 100644 --- a/src/net/eathena/npchandler.h +++ b/src/net/eathena/npchandler.h @@ -35,61 +35,61 @@ class NpcHandler final : public Ea::NpcHandler A_DELETE_COPY(NpcHandler) - void talk(const BeingId npcId) const final; + void talk(const BeingId npcId) const override final; - void nextDialog(const BeingId npcId) const final; + void nextDialog(const BeingId npcId) const override final; - void closeDialog(const BeingId npcId) final; + void closeDialog(const BeingId npcId) override final; void listInput(const BeingId npcId, - const unsigned char value) const final; + const unsigned char value) const override final; void integerInput(const BeingId npcId, - const int value) const final; + const int value) const override final; void stringInput(const BeingId npcId, - const std::string &value) const final; + const std::string &value) const override final; - void buy(const BeingId beingId) const final; + void buy(const BeingId beingId) const override final; - void sell(const BeingId beingId) const final; + void sell(const BeingId beingId) const override final; void buyItem(const BeingId beingId, const int itemId, const ItemColor color, - const int amount) const final; + const int amount) const override final; void buyItems(std::vector<ShopItem*> &items) const - final; + override final; void sellItem(const BeingId beingId, const int itemId, - const int amount) const final; + const int amount) const override final; - void sellItems(std::vector<ShopItem*> &items) const final; + void sellItems(std::vector<ShopItem*> &items) const override final; - void completeProgressBar() const final; + void completeProgressBar() const override final; void produceMix(const int nameId, const int materialId1, const int materialId2, - const int materialId3) const final; + const int materialId3) const override final; void cooking(const CookingTypeT type, - const int nameId) const final; + const int nameId) const override final; - void repair(const int index) const final; + void repair(const int index) const override final; - void refine(const int index) const final; + void refine(const int index) const override final; BeingId getNpc(Net::MessageIn &msg, - const NpcActionT action) final; + const NpcActionT action) override final; - void identify(const int index) const final; + void identify(const int index) const override final; - void selectArrow(const int nameId) const final; + void selectArrow(const int nameId) const override final; - void selectAutoSpell(const int skillId) const final; + void selectAutoSpell(const int skillId) const override final; }; } // namespace EAthena diff --git a/src/net/eathena/partyhandler.h b/src/net/eathena/partyhandler.h index d7342da60..9cee0cc67 100644 --- a/src/net/eathena/partyhandler.h +++ b/src/net/eathena/partyhandler.h @@ -36,28 +36,28 @@ class PartyHandler final : public Ea::PartyHandler ~PartyHandler(); - void create(const std::string &name) const final; + void create(const std::string &name) const override final; - void invite(const std::string &name) const final; + void invite(const std::string &name) const override final; void inviteResponse(const int partyId, - const bool accept) const final; + const bool accept) const override final; - void leave() const final; + void leave() const override final; - void kick(const Being *const being) const final; + void kick(const Being *const being) const override final; - void kick(const std::string &name) const final; + void kick(const std::string &name) const override final; - void chat(const std::string &text) const final; + void chat(const std::string &text) const override final; - void setShareExperience(const PartyShareT share) const final; + void setShareExperience(const PartyShareT share) const override final; - void setShareItems(const PartyShareT share) const final; + void setShareItems(const PartyShareT share) const override final; - void changeLeader(const std::string &name) const final; + void changeLeader(const std::string &name) const override final; - void allowInvite(const bool allow) const final; + void allowInvite(const bool allow) const override final; }; } // namespace EAthena diff --git a/src/net/eathena/pethandler.h b/src/net/eathena/pethandler.h index e481a660f..ab5eaded6 100644 --- a/src/net/eathena/pethandler.h +++ b/src/net/eathena/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; + void catchPet(const Being *const being) const override final; - void sendPetMessage(const int data) const final; + void sendPetMessage(const int data) const override final; - void setName(const std::string &name) const final; + void setName(const std::string &name) const override final; - void requestStatus() const final; + void requestStatus() const override final; - void feed() const final; + void feed() const override final; - void dropLoot() const final; + void dropLoot() const override final; - void returnToEgg() const final; + void returnToEgg() const override final; - void unequip() const final; + void unequip() const override final; - void setDirection(const unsigned char type) const final; + void setDirection(const unsigned char type) const override final; - void startAi(const bool start) const final A_CONST; + void startAi(const bool start) const override final A_CONST; }; } // namespace EAthena diff --git a/src/net/eathena/playerhandler.h b/src/net/eathena/playerhandler.h index c490b8f89..6f8e9b4eb 100644 --- a/src/net/eathena/playerhandler.h +++ b/src/net/eathena/playerhandler.h @@ -36,43 +36,43 @@ class PlayerHandler final : public Ea::PlayerHandler A_DELETE_COPY(PlayerHandler) void attack(const BeingId id, - const Keep keep) const final; - void stopAttack() const final; - void emote(const uint8_t emoteId) const final; + const Keep keep) const override final; + void stopAttack() const override final; + void emote(const uint8_t emoteId) const override final; void increaseAttribute(const AttributesT attr, - const int amount) const final; - void increaseSkill(const uint16_t skillId) const final; + const int amount) const override final; + void increaseSkill(const uint16_t skillId) const override final; - void pickUp(const FloorItem *const floorItem) const final; - void setDirection(const unsigned char direction) const final; + void pickUp(const FloorItem *const floorItem) const override final; + void setDirection(const unsigned char direction) const override final; void setDestination(const int x, const int y, - const int direction) const final; + const int direction) const override final; void changeAction(const BeingActionT &action) - const final; - void updateStatus(const uint8_t status) const final; + const override final; + void updateStatus(const uint8_t status) const override final; - void requestOnlineList() const final; - void respawn() const final; + void requestOnlineList() const override final; + void respawn() const override final; void setShortcut(const int idx, const uint8_t type, const int id, - const int level) const final; - void shortcutShiftRow(const int row) const final; - void removeOption() const final; - void changeCart(const int type) const final; - void setMemo() const final; - void doriDori() const final; - void explosionSpirits() const final; - void requestPvpInfo() const final; - void revive() const final; - void setViewEquipment(const bool allow) const final; + const int level) const override final; + void shortcutShiftRow(const int row) const override final; + void removeOption() const override final; + void changeCart(const int type) const override final; + void setMemo() const override final; + void doriDori() const override final; + void explosionSpirits() const override final; + void requestPvpInfo() const override final; + void revive() const override final; + void setViewEquipment(const bool allow) const override final; void setStat(Net::MessageIn &msg, const int type, const int base, const int mod, - const Notify notify) const final; + const Notify notify) const override final; }; } // namespace EAthena diff --git a/src/net/eathena/questhandler.h b/src/net/eathena/questhandler.h index bbeaab699..3644c4662 100644 --- a/src/net/eathena/questhandler.h +++ b/src/net/eathena/questhandler.h @@ -34,7 +34,7 @@ class QuestHandler final : public Net::QuestHandler A_DELETE_COPY(QuestHandler) void setQeustActiveState(const int questId, - const bool active) const final; + const bool active) const override final; }; } // namespace EAthena diff --git a/src/net/eathena/searchstorehandler.h b/src/net/eathena/searchstorehandler.h index 454ea7b66..89fa4ea5b 100644 --- a/src/net/eathena/searchstorehandler.h +++ b/src/net/eathena/searchstorehandler.h @@ -35,15 +35,15 @@ class SearchStoreHandler final : public Net::SearchStoreHandler void search(const StoreSearchTypeT type, const int minPrice, const int maxPrice, - const int itemId) const final; + const int itemId) const override final; - void nextPage() const final; + void nextPage() const override final; - void close() const final; + void close() const override final; void select(const int accountId, const int storeId, - const int itemId) const final; + const int itemId) const override final; }; } // namespace EAthena diff --git a/src/net/eathena/serverfeatures.h b/src/net/eathena/serverfeatures.h index 213334997..3206f1adf 100644 --- a/src/net/eathena/serverfeatures.h +++ b/src/net/eathena/serverfeatures.h @@ -34,109 +34,109 @@ class ServerFeatures final : public Net::ServerFeatures A_DELETE_COPY(ServerFeatures) - bool haveServerOnlineList() const final; + bool haveServerOnlineList() const override final; - bool haveOnlineList() const final A_CONST; + bool haveOnlineList() const override final A_CONST; - bool havePartyNickInvite() const final A_CONST; + bool havePartyNickInvite() const override final A_CONST; - bool haveChangePartyLeader() const final A_CONST; + bool haveChangePartyLeader() const override final A_CONST; - bool haveServerHp() const final A_CONST; + bool haveServerHp() const override final A_CONST; - bool havePlayerStatusUpdate() const final; + bool havePlayerStatusUpdate() const override final; - bool haveBrokenPlayerAttackDistance() const final A_CONST; + bool haveBrokenPlayerAttackDistance() const override final A_CONST; - bool haveNativeGuilds() const final A_CONST; + bool haveNativeGuilds() const override final A_CONST; - bool haveIncompleteChatMessages() const final A_CONST; + bool haveIncompleteChatMessages() const override final A_CONST; - bool haveRaceSelection() const final; + bool haveRaceSelection() const override final; - bool haveLookSelection() const final; + bool haveLookSelection() const override final; - bool haveChatChannels() const final A_CONST; + bool haveChatChannels() const override final A_CONST; - bool haveServerIgnore() const final A_CONST; + bool haveServerIgnore() const override final A_CONST; - bool haveMove3() const final; + bool haveMove3() const override final; - bool haveItemColors() const final A_CONST; + bool haveItemColors() const override final A_CONST; - bool haveAccountOtherGender() const final A_CONST; + bool haveAccountOtherGender() const override final A_CONST; - bool haveCharOtherGender() const final; + bool haveCharOtherGender() const override final; - bool haveMonsterAttackRange() const final A_CONST; + bool haveMonsterAttackRange() const override final A_CONST; - bool haveMonsterName() const final A_CONST; + bool haveMonsterName() const override final A_CONST; - bool haveEmailOnRegister() const final; + bool haveEmailOnRegister() const override final; - bool haveEmailOnDelete() const final; + bool haveEmailOnDelete() const override final; - bool haveEightDirections() const final A_CONST; + bool haveEightDirections() const override final A_CONST; - bool haveCharRename() const final A_CONST; + bool haveCharRename() const override final A_CONST; - bool haveBankApi() const final A_CONST; + bool haveBankApi() const override final A_CONST; - bool haveServerVersion() const final; + bool haveServerVersion() const override final; - bool haveMapServerVersion() const final; + bool haveMapServerVersion() const override final; - bool haveNpcGender() const final; + bool haveNpcGender() const override final; - bool haveJoinChannel() const final; + bool haveJoinChannel() const override final; - bool haveNpcWhispers() const final A_CONST; + bool haveNpcWhispers() const override final A_CONST; - bool haveCreateCharGender() const final; + bool haveCreateCharGender() const override final; - bool haveAttackDirections() const final A_CONST; + bool haveAttackDirections() const override final A_CONST; - bool haveVending() const final A_CONST; + bool haveVending() const override final A_CONST; - bool haveCart() const final A_CONST; + bool haveCart() const override final A_CONST; - bool haveTalkPet() const final; + bool haveTalkPet() const override final; - bool haveMovePet() const final; + bool haveMovePet() const override final; - bool haveServerWarpNames() const final; + bool haveServerWarpNames() const override final; - bool haveExpPacket() const final A_CONST; + bool haveExpPacket() const override final A_CONST; - bool haveMute() const final A_CONST; + bool haveMute() const override final A_CONST; - bool haveChangePassword() const final; + bool haveChangePassword() const override final; - bool haveTeamId() const final A_CONST; + bool haveTeamId() const override final A_CONST; - bool haveNewGuild() const final A_CONST; + bool haveNewGuild() const override final A_CONST; - bool haveAdvancedSprites() const final; + bool haveAdvancedSprites() const override final; - bool haveExtendedRiding() const final; + bool haveExtendedRiding() const override final; - bool haveAdvancedBuySell() const final A_CONST; + bool haveAdvancedBuySell() const override final A_CONST; - bool haveSlide() const final; + bool haveSlide() const override final; - bool haveExtendedDropsPosition() const final; + bool haveExtendedDropsPosition() const override final; - bool haveSecureTrades() const final; + bool haveSecureTrades() const override final; - bool haveMultyStatusUp() const final; + bool haveMultyStatusUp() const override final; - bool haveMail() const final; + bool haveMail() const override final; - bool haveServerPets() const final; + bool haveServerPets() const override final; - bool haveFamily() const final; + bool haveFamily() const override final; - bool haveMoveWhileSit() const final; + bool haveMoveWhileSit() const override final; }; } // namespace EAthena diff --git a/src/net/eathena/skillhandler.h b/src/net/eathena/skillhandler.h index bc0682b24..77fc6dadb 100644 --- a/src/net/eathena/skillhandler.h +++ b/src/net/eathena/skillhandler.h @@ -37,24 +37,24 @@ class SkillHandler final : public Ea::SkillHandler void useBeing(const int id, const int level, - const BeingId beingId) const final; + const BeingId beingId) const override final; void usePos(const int id, const int level, - const int x, const int y) const final; + const int x, const int y) const override final; void usePos(const int id, const int level, const int x, const int y, - const std::string &text) const final; + const std::string &text) const override final; - void useMap(const int id, const std::string &map) const final; + void useMap(const int id, const std::string &map) const override final; - void getAlchemistRanks() const final; + void getAlchemistRanks() const override final; - void getBlacksmithRanks() const final; + void getBlacksmithRanks() const override final; - void getPkRanks() const final; + void getPkRanks() const override final; }; } // namespace EAthena diff --git a/src/net/eathena/tradehandler.h b/src/net/eathena/tradehandler.h index 38527e6ab..9ccd2d320 100644 --- a/src/net/eathena/tradehandler.h +++ b/src/net/eathena/tradehandler.h @@ -35,20 +35,20 @@ class TradeHandler final : public Ea::TradeHandler A_DELETE_COPY(TradeHandler) - void request(const Being *const being) const final; + void request(const Being *const being) const override final; - void respond(const bool accept) const final; + void respond(const bool accept) const override final; void addItem(const Item *const item, - const int amount) const final; + const int amount) const override final; - void setMoney(const int amount) const final; + void setMoney(const int amount) const override final; - void confirm() const final; + void confirm() const override final; - void finish() const final; + void finish() const override final; - void cancel() const final; + void cancel() const override final; }; } // namespace EAthena diff --git a/src/net/eathena/vendinghandler.h b/src/net/eathena/vendinghandler.h index ce5fd5db5..b824a8d8e 100644 --- a/src/net/eathena/vendinghandler.h +++ b/src/net/eathena/vendinghandler.h @@ -32,23 +32,23 @@ class VendingHandler final : public Net::VendingHandler A_DELETE_COPY(VendingHandler) - void close() const final; + void close() const override final; - void open(const Being *const being) const final; + void open(const Being *const being) const override final; void buy(const Being *const being, const int index, - const int amount) const final; + const int amount) const override final; void buy2(const Being *const being, const int vendId, const int index, - const int amount) const final; + const int amount) const override final; void createShop(const std::string &name, const bool flag, const std::vector<ShopItem*> &items) const - final; + override final; }; } // namespace EAthena |