summaryrefslogtreecommitdiff
path: root/src/net/tmwa
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-01-09 04:41:50 +0300
committerAndrei Karas <akaras@inbox.ru>2018-01-09 04:41:50 +0300
commit62471b26135021d75f1b9255ab613746ae2ad67a (patch)
tree6b5e8b29c6c9432ba03ce2fe06a5df4dc19e2ca3 /src/net/tmwa
parente6704b8b023f5507be7b1bc5ba0b564e30e6e30f (diff)
downloadManaVerse-62471b26135021d75f1b9255ab613746ae2ad67a.tar.gz
ManaVerse-62471b26135021d75f1b9255ab613746ae2ad67a.tar.bz2
ManaVerse-62471b26135021d75f1b9255ab613746ae2ad67a.tar.xz
ManaVerse-62471b26135021d75f1b9255ab613746ae2ad67a.zip
Remove useless A_CONST attributes.
Diffstat (limited to 'src/net/tmwa')
-rw-r--r--src/net/tmwa/adminhandler.h110
-rw-r--r--src/net/tmwa/auctionhandler.h18
-rw-r--r--src/net/tmwa/bankhandler.h10
-rw-r--r--src/net/tmwa/battlegroundhandler.h10
-rw-r--r--src/net/tmwa/beinghandler.h9
-rw-r--r--src/net/tmwa/buyingstorehandler.h9
-rw-r--r--src/net/tmwa/buysellhandler.h2
-rw-r--r--src/net/tmwa/cashshophandler.h13
-rw-r--r--src/net/tmwa/charserverhandler.h7
-rw-r--r--src/net/tmwa/chathandler.h27
-rw-r--r--src/net/tmwa/familyhandler.h5
-rw-r--r--src/net/tmwa/friendshandler.h6
-rw-r--r--src/net/tmwa/guildhandler.h18
-rw-r--r--src/net/tmwa/homunculushandler.h20
-rw-r--r--src/net/tmwa/inventoryhandler.h8
-rw-r--r--src/net/tmwa/loginhandler.h8
-rw-r--r--src/net/tmwa/mailhandler.h18
-rw-r--r--src/net/tmwa/markethandler.h8
-rw-r--r--src/net/tmwa/mercenaryhandler.h16
-rw-r--r--src/net/tmwa/npchandler.h22
-rw-r--r--src/net/tmwa/partyhandler.h5
-rw-r--r--src/net/tmwa/pethandler.h16
-rw-r--r--src/net/tmwa/playerhandler.h22
-rw-r--r--src/net/tmwa/questhandler.h3
-rw-r--r--src/net/tmwa/searchstorehandler.h8
-rw-r--r--src/net/tmwa/vendinghandler.h12
26 files changed, 187 insertions, 223 deletions
diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h
index afaa546d1..79eb3ed55 100644
--- a/src/net/tmwa/adminhandler.h
+++ b/src/net/tmwa/adminhandler.h
@@ -45,14 +45,14 @@ class AdminHandler final : public Ea::AdminHandler
void kick(const BeingId playerId) const override final;
- void kickAll() const override final A_CONST;
+ void kickAll() const override final;
void warp(const std::string &map,
const int x, const int y) const override final;
- void resetStats() const override final A_CONST;
+ void resetStats() const override final;
- void resetSkills() const override final A_CONST;
+ void resetSkills() const override final;
void gotoName(const std::string &name) const override final;
@@ -60,115 +60,101 @@ class AdminHandler final : public Ea::AdminHandler
void mute(const Being *const being,
const int type,
- const int limit) const override final A_CONST;
+ const int limit) const override final;
- void muteName(const std::string &name) const override final A_CONST;
+ void muteName(const std::string &name) const override final;
- void requestLogin(const Being *const being) const override final
- A_CONST;
+ void requestLogin(const Being *const being) const override final;
void setTileType(const int x, const int y,
- const int type) const override final A_CONST;
+ const int type) const override final;
- void unequipAll(const Being *const being) const override final A_CONST;
+ void unequipAll(const Being *const being) const override final;
- void requestStats(const std::string &name) const override final
- A_CONST;
+ void requestStats(const std::string &name) const override final;
- void monsterInfo(const std::string &name) const override final A_CONST;
+ void monsterInfo(const std::string &name) const override final;
- void itemInfo(const std::string &name) const override final A_CONST;
+ void itemInfo(const std::string &name) const override final;
- void whoDrops(const std::string &name) const override final A_CONST;
+ void whoDrops(const std::string &name) const override final;
- void mobSearch(const std::string &name) const override final A_CONST;
+ void mobSearch(const std::string &name) const override final;
- void mobSpawnSearch(const std::string &name) const override final
- A_CONST;
+ void mobSpawnSearch(const std::string &name) const override final;
- void playerGmCommands(const std::string &name) const override final
- A_CONST;
+ void playerGmCommands(const std::string &name) const override final;
- void playerCharGmCommands(const std::string &name) const override final
- A_CONST;
+ void playerCharGmCommands(const std::string &name) const
+ override final;
- void showLevel(const std::string &name) const override final A_CONST;
+ void showLevel(const std::string &name) const override final;
- void showStats(const std::string &name) const override final A_CONST;
+ void showStats(const std::string &name) const override final;
- void showStorageList(const std::string &name) const override final
- A_CONST;
+ void showStorageList(const std::string &name) const override final;
- void showCartList(const std::string &name) const override final
- A_CONST;
+ void showCartList(const std::string &name) const override final;
- void showInventoryList(const std::string &name) const override final
- A_CONST;
+ void showInventoryList(const std::string &name) const override final;
- void locatePlayer(const std::string &name) const override final
- A_CONST;
+ void locatePlayer(const std::string &name) const override final;
- void showAccountInfo(const std::string &name) const override final
- A_CONST;
+ void showAccountInfo(const std::string &name) const override final;
- void spawnSlave(const std::string &name) const override final A_CONST;
+ void spawnSlave(const std::string &name) const override final;
- void spawnClone(const std::string &name) const override final A_CONST;
+ void spawnClone(const std::string &name) const override final;
- void spawnSlaveClone(const std::string &name) const override final
- A_CONST;
+ void spawnSlaveClone(const std::string &name) const override final;
- void spawnEvilClone(const std::string &name) const override final
- A_CONST;
+ void spawnEvilClone(const std::string &name) const override final;
- void savePosition(const std::string &name) const override final
- A_CONST;
+ void savePosition(const std::string &name) const override final;
- void loadPosition(const std::string &name) const override final
- A_CONST;
+ void loadPosition(const std::string &name) const override final;
- void randomWarp(const std::string &name) const override final A_CONST;
+ void randomWarp(const std::string &name) const override final;
- void gotoNpc(const std::string &name) const override final A_CONST;
+ void gotoNpc(const std::string &name) const override final;
- void killer(const std::string &name) const override final A_CONST;
+ void killer(const std::string &name) const override final;
- void killable(const std::string &name) const override final A_CONST;
+ void killable(const std::string &name) const override final;
- void heal(const std::string &name) const override final A_CONST;
+ void heal(const std::string &name) const override final;
void alive(const std::string &name) const override final;
- void disguise(const std::string &name) const override final A_CONST;
+ void disguise(const std::string &name) const override final;
- void immortal(const std::string &name) const override final A_CONST;
+ void immortal(const std::string &name) const override final;
void hide(const std::string &name) const override final;
- void nuke(const std::string &name) const override final A_CONST;
+ void nuke(const std::string &name) const override final;
- void kill(const std::string &name) const override final A_CONST;
+ void kill(const std::string &name) const override final;
- void jail(const std::string &name) const override final A_CONST;
+ void jail(const std::string &name) const override final;
- void unjail(const std::string &name) const override final A_CONST;
+ void unjail(const std::string &name) const override final;
void npcMove(const std::string &name,
const int x,
- const int y) const override final A_CONST;
+ const int y) const override final;
- void hideNpc(const std::string &name) const override final A_CONST;
+ void hideNpc(const std::string &name) const override final;
- void showNpc(const std::string &name) const override final A_CONST;
+ void showNpc(const std::string &name) const override final;
- void changePartyLeader(const std::string &name) const override final
- A_CONST;
+ void changePartyLeader(const std::string &name) const override final;
- void partyRecall(const std::string &name) const override final A_CONST;
+ void partyRecall(const std::string &name) const override final;
- void breakGuild(const std::string &name) const override final A_CONST;
+ void breakGuild(const std::string &name) const override final;
- void guildRecall(const std::string &name) const override final A_CONST;
+ void guildRecall(const std::string &name) const override final;
void slide(const int x, const int y) const override final;
};
diff --git a/src/net/tmwa/auctionhandler.h b/src/net/tmwa/auctionhandler.h
index 1d5b8771e..28ec0ae71 100644
--- a/src/net/tmwa/auctionhandler.h
+++ b/src/net/tmwa/auctionhandler.h
@@ -34,30 +34,30 @@ class AuctionHandler final : public Net::AuctionHandler
~AuctionHandler() override final;
- void cancelReg() const override final A_CONST;
+ void cancelReg() const override final;
void setItem(const Item *const item,
- const int amount) const override final A_CONST;
+ const int amount) const override final;
void reg(const int currentPrice,
const int maxPrice,
- const int hours) const override final A_CONST;
+ const int hours) const override final;
- void cancel(const int auctionId) const override final A_CONST;
+ void cancel(const int auctionId) const override final;
- void close(const int auctionId) const override final A_CONST;
+ void close(const int auctionId) const override final;
void bid(const int auctionId,
- const int money) const override final A_CONST;
+ const int money) const override final;
void search(const AuctionSearchTypeT type,
const int auctionId,
const std::string &text,
- const int page) const override final A_CONST;
+ const int page) const override final;
- void buy() const override final A_CONST;
+ void buy() const override final;
- void sell() const override final A_CONST;
+ void sell() const override final;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/bankhandler.h b/src/net/tmwa/bankhandler.h
index 0f95dcd49..4b436ff91 100644
--- a/src/net/tmwa/bankhandler.h
+++ b/src/net/tmwa/bankhandler.h
@@ -35,15 +35,15 @@ class BankHandler final : public Net::BankHandler
~BankHandler() override final;
- void deposit(const int money) const override final A_CONST;
+ void deposit(const int money) const override final;
- void withdraw(const int money) const override final A_CONST;
+ void withdraw(const int money) const override final;
- void check() const override final A_CONST;
+ void check() const override final;
- void open() const override final A_CONST;
+ void open() const override final;
- void close() const override final A_CONST;
+ void close() const override final;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/battlegroundhandler.h b/src/net/tmwa/battlegroundhandler.h
index f100ed96f..e9547846b 100644
--- a/src/net/tmwa/battlegroundhandler.h
+++ b/src/net/tmwa/battlegroundhandler.h
@@ -36,17 +36,15 @@ class BattleGroundHandler final : public Net::BattleGroundHandler
~BattleGroundHandler() override final;
void registerBg(const BattleGroundTypeT &type,
- const std::string &name) const override final A_CONST;
+ const std::string &name) const override final;
- void rekoveRequest(const std::string &name) const override final
- A_CONST;
+ void rekoveRequest(const std::string &name) const override final;
void beginAck(const bool result,
const std::string &bgName,
- const std::string &gameName) const override final
- A_CONST;
+ const std::string &gameName) const override final;
- void checkState(const std::string &name) const override final A_CONST;
+ void checkState(const std::string &name) const override final;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h
index 0fb38d951..06769e668 100644
--- a/src/net/tmwa/beinghandler.h
+++ b/src/net/tmwa/beinghandler.h
@@ -41,13 +41,12 @@ class BeingHandler final : public Ea::BeingHandler
void undress(Being *const being) const override final;
- void requestRanks(const RankT rank A_UNUSED) const override final
- A_CONST;
+ void requestRanks(const RankT rank A_UNUSED) const override final;
- void viewPlayerEquipment(const Being *const being) const override final
- A_CONST;
+ void viewPlayerEquipment(const Being *const being) const
+ override final;
- void requestNameByCharId(const int id) const override final A_CONST;
+ void requestNameByCharId(const int id) const override final;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/buyingstorehandler.h b/src/net/tmwa/buyingstorehandler.h
index bb48261b1..324a4bd05 100644
--- a/src/net/tmwa/buyingstorehandler.h
+++ b/src/net/tmwa/buyingstorehandler.h
@@ -38,17 +38,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 override final
- A_CONST;
+ const STD_VECTOR<ShopItem*> &items) const override final;
- void close() const override final A_CONST;
+ void close() const override final;
- void open(const Being *const being) const override final A_CONST;
+ 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 override final A_CONST;
+ const int amount) const override final;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/buysellhandler.h b/src/net/tmwa/buysellhandler.h
index 00c1e79a4..627ed4c66 100644
--- a/src/net/tmwa/buysellhandler.h
+++ b/src/net/tmwa/buysellhandler.h
@@ -51,7 +51,7 @@ class BuySellHandler final : public Ea::BuySellHandler
const ShopItem *const item,
const int amount) const override final;
- void close() const override final A_CONST;
+ void close() const override final;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/cashshophandler.h b/src/net/tmwa/cashshophandler.h
index b96fdf4a0..6c3883e13 100644
--- a/src/net/tmwa/cashshophandler.h
+++ b/src/net/tmwa/cashshophandler.h
@@ -38,19 +38,18 @@ class CashShopHandler final : public Net::CashShopHandler
void buyItem(const int points,
const int itemId,
const ItemColor color,
- const int amount) const override final A_CONST;
+ const int amount) const override final;
void buyItems(const int points,
- const STD_VECTOR<ShopItem*> &items) const override final
- A_CONST;
+ const STD_VECTOR<ShopItem*> &items) const override final;
- void close() const override final A_CONST;
+ void close() const override final;
- void requestPoints() const override final A_CONST;
+ void requestPoints() const override final;
- void requestTab(const int tab) const override final A_CONST;
+ void requestTab(const int tab) const override final;
- void schedule() const override final A_CONST;
+ void schedule() const override final;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h
index 99d72304a..5ea4b6a5c 100644
--- a/src/net/tmwa/charserverhandler.h
+++ b/src/net/tmwa/charserverhandler.h
@@ -56,8 +56,7 @@ class CharServerHandler final : public Ea::CharServerHandler
const std::string &email) const override final;
void renameCharacter(const BeingId id,
- const std::string &newName) const override final
- A_CONST;
+ const std::string &newName) const override final;
void switchCharacter() const override final;
@@ -79,9 +78,9 @@ class CharServerHandler final : public Ea::CharServerHandler
override final;
void changeSlot(const int oldSlot,
- const int newSlot) const override final A_CONST;
+ const int newSlot) const override final;
- void ping() const override final A_CONST;
+ void ping() const override final;
unsigned int hatSprite() const override final A_CONST A_WARN_UNUSED;
};
diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index 22b7a6cbe..58400b265 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -51,8 +51,7 @@ class ChatHandler final : public Ea::ChatHandler
const std::string &restrict text) const
override final;
- void joinChannel(const std::string &channel) const override final
- A_CONST;
+ void joinChannel(const std::string &channel) const override final;
void who() const override final;
@@ -65,39 +64,35 @@ class ChatHandler final : public Ea::ChatHandler
void createChatRoom(const std::string &title,
const std::string &password,
const int limit,
- const bool isPublic) const override final A_CONST;
+ const bool isPublic) const override final;
void ignore(const std::string &nick) const override final;
void unIgnore(const std::string &nick) const override final;
- void requestIgnoreList() const override final A_CONST;
+ void requestIgnoreList() const override final;
- void battleTalk(const std::string &text) const override final A_CONST;
+ void battleTalk(const std::string &text) const override final;
void joinChat(const ChatObject *const chat,
- const std::string &password) const override final
- A_CONST;
+ const std::string &password) const override final;
- void partChannel(const std::string &channel) const override final
- A_CONST;
+ void partChannel(const std::string &channel) const override final;
void talkPet(const std::string &restrict text,
const std::string &restrict channel) const override final;
- void leaveChatRoom() const override final A_CONST;
+ void leaveChatRoom() const override final;
void setChatRoomOptions(const int limit,
const bool isPublic,
const std::string &password,
- const std::string &title) const override final
- A_CONST;
+ const std::string &title) const
+ override final;
- void setChatRoomOwner(const std::string &nick) const override final
- A_CONST;
+ void setChatRoomOwner(const std::string &nick) const override final;
- void kickFromChatRoom(const std::string &nick) const override final
- A_CONST;
+ void kickFromChatRoom(const std::string &nick) const override final;
protected:
static void processRaw(MessageOut &restrict outMsg,
diff --git a/src/net/tmwa/familyhandler.h b/src/net/tmwa/familyhandler.h
index dc61dfe3f..09c8f3e82 100644
--- a/src/net/tmwa/familyhandler.h
+++ b/src/net/tmwa/familyhandler.h
@@ -35,10 +35,9 @@ class FamilyHandler final : public Net::FamilyHandler
~FamilyHandler() override final;
- void askForChild(const Being *const being) const override final
- A_CONST;
+ void askForChild(const Being *const being) const override final;
- void askForChildReply(const bool accept) const override final A_CONST;
+ void askForChildReply(const bool accept) const override final;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/friendshandler.h b/src/net/tmwa/friendshandler.h
index 88ade431a..35471baa3 100644
--- a/src/net/tmwa/friendshandler.h
+++ b/src/net/tmwa/friendshandler.h
@@ -34,14 +34,14 @@ class FriendsHandler final : public Net::FriendsHandler
~FriendsHandler() override final;
- void invite(const std::string &name) const override final A_CONST;
+ void invite(const std::string &name) const override final;
void inviteResponse(const int accountId,
const int charId,
- const bool accept) const override final A_CONST;
+ const bool accept) const override final;
void remove(const int accountId,
- const int charId) const override final A_CONST;
+ const int charId) const override final;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h
index 14907c3be..215eba679 100644
--- a/src/net/tmwa/guildhandler.h
+++ b/src/net/tmwa/guildhandler.h
@@ -71,30 +71,28 @@ class GuildHandler final : public Net::GuildHandler
void checkMaster() const override final;
void requestAlliance(const Being *const being) const override final
- A_CONST;
+ ;
void requestAllianceResponse(const int beingId,
- const bool accept) const override final
- A_CONST;
+ const bool accept) const override final;
void endAlliance(const int guildId,
- const int flag) const override final A_CONST;
+ 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 override final
- A_CONST;
+ const std::string &name) const override final;
void requestOpposition(const Being *const being) const override final
- A_CONST;
+ ;
- void breakGuild(const std::string &name) const override final A_CONST;
+ void breakGuild(const std::string &name) const override final;
- void changeEmblem(std::string emblem) const override final A_CONST;
+ void changeEmblem(std::string emblem) const override final;
- void requestEmblem(const int guildId) const override final A_CONST;
+ void requestEmblem(const int guildId) const override final;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/homunculushandler.h b/src/net/tmwa/homunculushandler.h
index 2eb14349a..5ff7f93d8 100644
--- a/src/net/tmwa/homunculushandler.h
+++ b/src/net/tmwa/homunculushandler.h
@@ -35,26 +35,24 @@ class HomunculusHandler final : public Net::HomunculusHandler
~HomunculusHandler() override final;
- void setName(const std::string &name) const override final A_CONST;
+ void setName(const std::string &name) const override final;
- void moveToMaster() const override final A_CONST;
+ void moveToMaster() const override final;
- void move(const int x, const int y) const override final A_CONST;
+ void move(const int x, const int y) const override final;
void attack(const BeingId targetId,
- const Keep keep) const override final A_CONST;
+ const Keep keep) const override final;
- void feed() const override final A_CONST;
+ void feed() const override final;
- void fire() const override final A_CONST;
+ void fire() const override final;
- void talk(const std::string &restrict text) const override final
- A_CONST;
+ void talk(const std::string &restrict text) const override final;
- void emote(const uint8_t emoteId) const override final A_CONST;
+ void emote(const uint8_t emoteId) const override final;
- void setDirection(const unsigned char type) const override final
- A_CONST;
+ void setDirection(const unsigned char type) const override final;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h
index 9b37ce747..7fc4f78b2 100644
--- a/src/net/tmwa/inventoryhandler.h
+++ b/src/net/tmwa/inventoryhandler.h
@@ -56,15 +56,15 @@ class InventoryHandler final : public Ea::InventoryHandler
const int amount,
const InventoryTypeT destination) const override final;
- void useCard(const Item *const item) override final A_CONST;
+ void useCard(const Item *const item) override final;
void insertCard(const int cardIndex,
- const int itemIndex) const override final A_CONST;
+ const int itemIndex) const override final;
void favoriteItem(const Item *const item,
- const bool favorite) const override final A_CONST;
+ const bool favorite) const override final;
- void selectEgg(const Item *const item) const override final A_CONST;
+ void selectEgg(const Item *const item) const override final;
int convertFromServerSlot(const int serverSlot)
const override final A_WARN_UNUSED;
diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h
index 89520f63d..caea92310 100644
--- a/src/net/tmwa/loginhandler.h
+++ b/src/net/tmwa/loginhandler.h
@@ -52,13 +52,13 @@ class LoginHandler final : public Ea::LoginHandler
ServerInfo *getCharServer() const override final A_CONST A_WARN_UNUSED;
- void sendVersion() const override final A_CONST;
+ void sendVersion() const override final;
- void ping() const override final A_CONST;
+ void ping() const override final;
- void updatePacketVersion() const override final A_CONST;
+ void updatePacketVersion() const override final;
- static void requestUpdateHosts() A_CONST;
+ static void requestUpdateHosts();
private:
void sendLoginRegister(const std::string &restrict username,
diff --git a/src/net/tmwa/mailhandler.h b/src/net/tmwa/mailhandler.h
index e84ea5402..3f4129771 100644
--- a/src/net/tmwa/mailhandler.h
+++ b/src/net/tmwa/mailhandler.h
@@ -35,26 +35,26 @@ class MailHandler final : public Net::MailHandler
~MailHandler() override final;
- void refresh() const override final A_CONST;
+ void refresh() const override final;
- void readMessage(const int msgId) const override final A_CONST;
+ void readMessage(const int msgId) const override final;
- void getAttach(const int msgId) const override final A_CONST;
+ void getAttach(const int msgId) const override final;
- void deleteMessage(const int msgId) const override final A_CONST;
+ void deleteMessage(const int msgId) const override final;
- void returnMessage(const int msgId) const override final A_CONST;
+ void returnMessage(const int msgId) const override final;
void setAttach(const int index,
- const int amount) const override final A_CONST;
+ const int amount) const override final;
- void setAttachMoney(const int money) const override final A_CONST;
+ void setAttachMoney(const int money) const override final;
- void resetAttach(const int flag) const override final A_CONST;
+ void resetAttach(const int flag) const override final;
void send(const std::string &name,
const std::string &title,
- std::string message) const override final A_CONST;
+ std::string message) const override final;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/markethandler.h b/src/net/tmwa/markethandler.h
index c820e07a6..62b33b2d3 100644
--- a/src/net/tmwa/markethandler.h
+++ b/src/net/tmwa/markethandler.h
@@ -34,15 +34,15 @@ class MarketHandler final : public Net::MarketHandler
~MarketHandler() override final;
- void close() const override final A_CONST;
+ void close() const override final;
void buyItem(const int itemId,
const ItemTypeT type,
const ItemColor color,
- const int amount) const override final A_CONST;
+ const int amount) const override final;
- void buyItems(const STD_VECTOR<ShopItem*> &items) const override final
- A_CONST;
+ void buyItems(const STD_VECTOR<ShopItem*> &items) const
+ override final;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/mercenaryhandler.h b/src/net/tmwa/mercenaryhandler.h
index 98834b781..207c8b3d2 100644
--- a/src/net/tmwa/mercenaryhandler.h
+++ b/src/net/tmwa/mercenaryhandler.h
@@ -35,22 +35,20 @@ class MercenaryHandler final : public Net::MercenaryHandler
~MercenaryHandler() override final;
- void fire() const override final A_CONST;
+ void fire() const override final;
- void moveToMaster() const override final A_CONST;
+ void moveToMaster() const override final;
- void move(const int x, const int y) const override final A_CONST;
+ void move(const int x, const int y) const override final;
void attack(const BeingId targetId,
- const Keep keep) const override final A_CONST;
+ const Keep keep) const override final;
- void talk(const std::string &restrict text) const override final
- A_CONST;
+ void talk(const std::string &restrict text) const override final;
- void emote(const uint8_t emoteId) const override final A_CONST;
+ void emote(const uint8_t emoteId) const override final;
- void setDirection(const unsigned char type) const override final
- A_CONST;
+ void setDirection(const unsigned char type) const override final;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index 353145929..d02d837ef 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -63,17 +63,15 @@ class NpcHandler final : public Ea::NpcHandler
const ItemColor color,
const int amount) const override final;
- void buyItems(STD_VECTOR<ShopItem*> &items) const override final
- A_CONST;
+ void buyItems(STD_VECTOR<ShopItem*> &items) const override final;
void sellItem(const BeingId beingId,
const int itemId,
const int amount) const override final;
- void sellItems(STD_VECTOR<ShopItem*> &items) const override final
- A_CONST;
+ void sellItems(STD_VECTOR<ShopItem*> &items) const override final;
- void completeProgressBar() const override final A_CONST;
+ void completeProgressBar() const override final;
BeingId getNpc(Net::MessageIn &msg,
const NpcActionT action) override final;
@@ -81,20 +79,20 @@ class NpcHandler final : public Ea::NpcHandler
void produceMix(const int nameId,
const int materialId1,
const int materialId2,
- const int materialId3) const override final A_CONST;
+ const int materialId3) const override final;
void cooking(const CookingTypeT type,
- const int nameId) const override final A_CONST;
+ const int nameId) const override final;
- void repair(const int index) const override final A_CONST;
+ void repair(const int index) const override final;
- void refine(const int index) const override final A_CONST;
+ void refine(const int index) const override final;
- void identify(const int index) const override final A_CONST;
+ void identify(const int index) const override final;
- void selectArrow(const int nameId) const override final A_CONST;
+ void selectArrow(const int nameId) const override final;
- void selectAutoSpell(const int skillId) const override final A_CONST;
+ void selectAutoSpell(const int skillId) const override final;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h
index 8040e168c..ee7aab7a1 100644
--- a/src/net/tmwa/partyhandler.h
+++ b/src/net/tmwa/partyhandler.h
@@ -55,10 +55,9 @@ class PartyHandler final : public Ea::PartyHandler
void setShareItems(const PartyShareT share) const override final;
- void changeLeader(const std::string &name) const override final
- A_CONST;
+ void changeLeader(const std::string &name) const override final;
- void allowInvite(const bool allow) const override final A_CONST;
+ void allowInvite(const bool allow) const override final;
void setShareAutoItems(const PartyShareT share) const override final;
diff --git a/src/net/tmwa/pethandler.h b/src/net/tmwa/pethandler.h
index 492a5ce2f..884110932 100644
--- a/src/net/tmwa/pethandler.h
+++ b/src/net/tmwa/pethandler.h
@@ -40,21 +40,21 @@ class PetHandler final : public Net::PetHandler
void emote(const uint8_t emoteId) override final;
- void catchPet(const Being *const being) const override final A_CONST;
+ void catchPet(const Being *const being) const override final;
- void sendPetMessage(const int data) const override final A_CONST;
+ void sendPetMessage(const int data) const override final;
- void setName(const std::string &name) const override final A_CONST;
+ void setName(const std::string &name) const override final;
- void requestStatus() const override final A_CONST;
+ void requestStatus() const override final;
- void feed() const override final A_CONST;
+ void feed() const override final;
- void dropLoot() const override final A_CONST;
+ void dropLoot() const override final;
- void returnToEgg() const override final A_CONST;
+ void returnToEgg() const override final;
- void unequip() const override final A_CONST;
+ void unequip() const override final;
void setDirection(const unsigned char type) const override final;
diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h
index 398030af1..fca26b2b8 100644
--- a/src/net/tmwa/playerhandler.h
+++ b/src/net/tmwa/playerhandler.h
@@ -52,33 +52,33 @@ class PlayerHandler final : public Ea::PlayerHandler
const int direction) const override final;
void changeAction(const BeingActionT &action)
const override final;
- void requestOnlineList() const override final A_CONST;
- void updateStatus(const uint8_t status) const override final A_CONST;
+ void requestOnlineList() const override final;
+ void updateStatus(const uint8_t status) const override final;
void respawn() const override final;
void setShortcut(const int idx,
const uint8_t type,
const int id,
- const int level) const override final A_CONST;
+ const int level) const override final;
void shortcutShiftRow(const int row) const override final;
- void removeOption() const override final A_CONST;
+ void removeOption() const override final;
- void changeCart(const int type) const override final A_CONST;
+ void changeCart(const int type) const override final;
- void setMemo() const override final A_CONST;
+ void setMemo() const override final;
- void doriDori() const override final A_CONST;
+ void doriDori() const override final;
- void explosionSpirits() const override final A_CONST;
+ void explosionSpirits() const override final;
- void requestPvpInfo() const override final A_CONST;
+ void requestPvpInfo() const override final;
- void revive() const override final A_CONST;
+ void revive() const override final;
- void setViewEquipment(const bool allow) const override final A_CONST;
+ void setViewEquipment(const bool allow) const override final;
void setStat(Net::MessageIn &msg,
const int type,
diff --git a/src/net/tmwa/questhandler.h b/src/net/tmwa/questhandler.h
index b7c3d336f..bbb16429c 100644
--- a/src/net/tmwa/questhandler.h
+++ b/src/net/tmwa/questhandler.h
@@ -36,8 +36,7 @@ class QuestHandler final : public Net::QuestHandler
~QuestHandler() override final;
void setQeustActiveState(const int questId,
- const bool active) const override final
- A_CONST;
+ const bool active) const override final;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/searchstorehandler.h b/src/net/tmwa/searchstorehandler.h
index 3e8d11abf..b17b3cf45 100644
--- a/src/net/tmwa/searchstorehandler.h
+++ b/src/net/tmwa/searchstorehandler.h
@@ -37,15 +37,15 @@ class SearchStoreHandler final : public Net::SearchStoreHandler
void search(const StoreSearchTypeT type,
const int minPrice,
const int maxPrice,
- const int itemId) const override final A_CONST;
+ const int itemId) const override final;
- void nextPage() const override final A_CONST;
+ void nextPage() const override final;
- void close() const override final A_CONST;
+ void close() const override final;
void select(const int accountId,
const int storeId,
- const int itemId) const override final A_CONST;
+ const int itemId) const override final;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/vendinghandler.h b/src/net/tmwa/vendinghandler.h
index c8858e077..841bd620a 100644
--- a/src/net/tmwa/vendinghandler.h
+++ b/src/net/tmwa/vendinghandler.h
@@ -35,27 +35,27 @@ class VendingHandler final : public Net::VendingHandler
~VendingHandler() override final;
- void close() const override final A_CONST;
+ void close() const override final;
- void open(const Being *const being) const override final A_CONST;
+ void open(const Being *const being) const override final;
void buy(const Being *const being,
const int index,
- const int amount) const override final A_CONST;
+ const int amount) const override final;
void buyItems(const Being *const being,
const STD_VECTOR<ShopItem*> &items) const
- override final A_CONST;
+ override final;
void buy2(const Being *const being,
const int vendId,
const int index,
- const int amount) const override final A_CONST;
+ const int amount) const override final;
void createShop(const std::string &name,
const bool flag,
const STD_VECTOR<ShopItem*> &items) const
- override final A_CONST;
+ override final;
};
} // namespace TmwAthena