summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/net/ea/adminhandler.h4
-rw-r--r--src/net/ea/charserverhandler.h6
-rw-r--r--src/net/ea/gamehandler.h2
-rw-r--r--src/net/ea/inventoryhandler.cpp5
-rw-r--r--src/net/ea/inventoryhandler.h10
-rw-r--r--src/net/ea/loginhandler.h11
-rw-r--r--src/net/ea/partyhandler.h2
-rw-r--r--src/net/ea/playerhandler.h7
-rw-r--r--src/net/ea/tradehandler.h2
-rw-r--r--src/net/eathena/buysellhandler.h8
-rw-r--r--src/net/eathena/cashshophandler.h3
-rw-r--r--src/net/eathena/charserverhandler.h4
-rw-r--r--src/net/eathena/gamehandler.h2
-rw-r--r--src/net/eathena/pethandler.h4
-rw-r--r--src/net/eathena/serverfeatures.h50
-rw-r--r--src/net/inventoryhandler.h2
-rw-r--r--src/net/messageout.h3
-rw-r--r--src/net/tmwa/adminhandler.h19
-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.h7
-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.h10
-rw-r--r--src/net/tmwa/chathandler.h24
-rw-r--r--src/net/tmwa/familyhandler.h4
-rw-r--r--src/net/tmwa/friendshandler.h6
-rw-r--r--src/net/tmwa/guildhandler.h20
-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.h19
-rw-r--r--src/net/tmwa/markethandler.h7
-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.h18
-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/serverfeatures.h68
-rw-r--r--src/net/tmwa/vendinghandler.h11
44 files changed, 267 insertions, 245 deletions
diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h
index c73fbafde..52d648bb4 100644
--- a/src/net/ea/adminhandler.h
+++ b/src/net/ea/adminhandler.h
@@ -43,11 +43,11 @@ class AdminHandler notfinal : public Net::AdminHandler
void kickName(const std::string &name) const override final;
- void ban(const int playerId) const override final;
+ void ban(const int playerId) const override final A_CONST;
void banName(const std::string &name) const override final;
- void unban(const int playerId) const override final;
+ void unban(const int playerId) const override final A_CONST;
void unbanName(const std::string &name) const override final;
diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h
index 72a7baff8..e6b739844 100644
--- a/src/net/ea/charserverhandler.h
+++ b/src/net/ea/charserverhandler.h
@@ -41,11 +41,11 @@ class CharServerHandler notfinal : public Net::CharServerHandler
void requestCharacters() override final;
- unsigned int baseSprite() const override final A_WARN_UNUSED;
+ unsigned int baseSprite() const override final A_CONST A_WARN_UNUSED;
- unsigned int hairSprite() const override final A_WARN_UNUSED;
+ unsigned int hairSprite() const override final A_CONST A_WARN_UNUSED;
- unsigned int maxSprite() const override final A_WARN_UNUSED;
+ unsigned int maxSprite() const override final A_CONST A_WARN_UNUSED;
virtual void connect() = 0;
diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h
index 123fbb543..1f35e9518 100644
--- a/src/net/ea/gamehandler.h
+++ b/src/net/ea/gamehandler.h
@@ -35,7 +35,7 @@ class GameHandler notfinal : public Net::GameHandler
A_DELETE_COPY(GameHandler)
- void who() const override final;
+ void who() const override final A_CONST;
bool removeDeadBeings() const override final A_WARN_UNUSED
{ return true; }
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index 44931ae8a..8f1fbe332 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -76,11 +76,6 @@ void InventoryHandler::moveItem(const int oldIndex A_UNUSED,
// Not implemented for eAthena (possible?)
}
-void InventoryHandler::openStorage(const int type A_UNUSED) const
-{
- // Doesn't apply to eAthena, since opening happens through NPCs?
-}
-
size_t InventoryHandler::getSize(const InventoryTypeT type) const
{
switch (type)
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index 5c6f4258e..b6f6fdc06 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -46,18 +46,16 @@ class InventoryHandler notfinal : public Net::InventoryHandler
void clear() override final;
bool canSplit(const Item *const item) const
- override final A_WARN_UNUSED;
+ override final A_CONST A_WARN_UNUSED;
void splitItem(const Item *const item,
- const int amount) const override final;
+ const int amount) const override final A_CONST;
void moveItem(const int oldIndex,
- const int newIndex) const override final;
-
- void openStorage(const int type) const override final;
+ const int newIndex) const override final A_CONST;
size_t getSize(const InventoryTypeT type) const override final
- A_WARN_UNUSED;
+ A_CONST A_WARN_UNUSED;
void pushPickup(const BeingId floorId);
diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h
index fb9003473..63bf0afc8 100644
--- a/src/net/ea/loginhandler.h
+++ b/src/net/ea/loginhandler.h
@@ -54,21 +54,22 @@ class LoginHandler notfinal : public Net::LoginHandler
void registerAccount(const LoginData *const loginData)
const override final;
- const Worlds &getWorlds() const override final A_WARN_UNUSED;
+ const Worlds &getWorlds() const override final A_CONST A_WARN_UNUSED;
void clearWorlds() override final;
virtual ServerInfo *getCharServer() const A_WARN_UNUSED = 0;
- const Token &getToken() const A_WARN_UNUSED;
+ const Token &getToken() const A_CONST A_WARN_UNUSED;
- void logout() const override final;
+ void logout() const override final A_CONST;
- void changeEmail(const std::string &email) const override final;
+ void changeEmail(const std::string &email) const
+ override final A_CONST;
void unregisterAccount(const std::string &username,
const std::string &password)
- const override final;
+ const override final A_CONST;
void loginOrRegister(LoginData *const data) const override final;
diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h
index 2dc8e5c87..22c9592f3 100644
--- a/src/net/ea/partyhandler.h
+++ b/src/net/ea/partyhandler.h
@@ -37,7 +37,7 @@ class PartyHandler notfinal : public Net::PartyHandler
virtual ~PartyHandler();
- void join(const int partyId) const override final;
+ void join(const int partyId) const override final A_CONST;
PartyShareT getShareExperience() const override final A_WARN_UNUSED;
diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h
index a04d78ee6..c94e1f4fb 100644
--- a/src/net/ea/playerhandler.h
+++ b/src/net/ea/playerhandler.h
@@ -42,12 +42,13 @@ class PlayerHandler notfinal : public Net::PlayerHandler
A_DELETE_COPY(PlayerHandler)
- void decreaseAttribute(const AttributesT attr) const override final;
+ void decreaseAttribute(const AttributesT attr) const
+ override final A_CONST;
void ignorePlayer(const std::string &player,
- const bool ignore) const override final;
+ const bool ignore) const override final A_CONST;
- void ignoreAll(const bool ignore) const override final;
+ void ignoreAll(const bool ignore) const override final A_CONST;
bool canUseMagic() const override final;
diff --git a/src/net/ea/tradehandler.h b/src/net/ea/tradehandler.h
index 1ee4bde92..3e19ce91e 100644
--- a/src/net/ea/tradehandler.h
+++ b/src/net/ea/tradehandler.h
@@ -36,7 +36,7 @@ class TradeHandler notfinal : public Net::TradeHandler
A_DELETE_COPY(TradeHandler)
void removeItem(const int slotNum,
- const int amount) const override final;
+ const int amount) const override final A_CONST;
};
} // namespace Ea
diff --git a/src/net/eathena/buysellhandler.h b/src/net/eathena/buysellhandler.h
index 6327bfbff..a0a9ba205 100644
--- a/src/net/eathena/buysellhandler.h
+++ b/src/net/eathena/buysellhandler.h
@@ -36,18 +36,18 @@ class BuySellHandler final : public Ea::BuySellHandler
A_DELETE_COPY(BuySellHandler)
void requestSellList(const std::string &nick)
- const override final;
+ const override final A_CONST;
void requestBuyList(const std::string &nick)
- const override final;
+ const override final A_CONST;
void sendBuyRequest(const std::string &nick,
const ShopItem *const item,
- const int amount) const override final;
+ const int amount) const override final A_CONST;
void sendSellRequest(const std::string &nick,
const ShopItem *const item,
- const int amount) const override final;
+ const int amount) const override final A_CONST;
void close() const override final;
};
diff --git a/src/net/eathena/cashshophandler.h b/src/net/eathena/cashshophandler.h
index 132d019b8..71ac1b501 100644
--- a/src/net/eathena/cashshophandler.h
+++ b/src/net/eathena/cashshophandler.h
@@ -39,7 +39,8 @@ class CashShopHandler final : public Net::CashShopHandler
const ItemColor color,
const int amount) const override final;
- void buyItems(std::vector<ShopItem*> &items) const override final;
+ void buyItems(std::vector<ShopItem*> &items) const override final
+ A_CONST;
void close() const override final;
diff --git a/src/net/eathena/charserverhandler.h b/src/net/eathena/charserverhandler.h
index e08a73584..60f3855d7 100644
--- a/src/net/eathena/charserverhandler.h
+++ b/src/net/eathena/charserverhandler.h
@@ -61,7 +61,7 @@ class CharServerHandler final : public Ea::CharServerHandler
bool isNeedCreatePin() const override final A_WARN_UNUSED;
- void setNewPincode(const std::string &pin) override final;
+ void setNewPincode(const std::string &pin) override final A_CONST;
/**
* Sets the character create dialog. The handler will clean up this
@@ -75,7 +75,7 @@ class CharServerHandler final : public Ea::CharServerHandler
void ping() const override final;
- unsigned int hatSprite() const override final A_WARN_UNUSED;
+ unsigned int hatSprite() const override final A_CONST A_WARN_UNUSED;
};
} // namespace EAthena
diff --git a/src/net/eathena/gamehandler.h b/src/net/eathena/gamehandler.h
index ddbe43c07..c5b20f8e9 100644
--- a/src/net/eathena/gamehandler.h
+++ b/src/net/eathena/gamehandler.h
@@ -45,7 +45,7 @@ class GameHandler final : public Ea::GameHandler
void ping(const int tick) const override final;
- void disconnect2() const override final;
+ void disconnect2() const override final A_CONST;
void mapLoadedEvent() const override final;
diff --git a/src/net/eathena/pethandler.h b/src/net/eathena/pethandler.h
index 2e8dddb05..bc03e3dbd 100644
--- a/src/net/eathena/pethandler.h
+++ b/src/net/eathena/pethandler.h
@@ -38,7 +38,7 @@ class PetHandler final : public Net::PetHandler
void spawn(const Being *const being,
const int petId,
- const int x, const int y) const override final;
+ const int x, const int y) const override final A_CONST;
void emote(const uint8_t emoteId,
const int petId) override final;
@@ -61,7 +61,7 @@ class PetHandler final : public Net::PetHandler
void setDirection(const unsigned char type) const override final;
- void startAi(const bool start) const override final;
+ void startAi(const bool start) const override final A_CONST;
};
} // namespace EAthena
diff --git a/src/net/eathena/serverfeatures.h b/src/net/eathena/serverfeatures.h
index 980d6fa9a..3d0eeb9d4 100644
--- a/src/net/eathena/serverfeatures.h
+++ b/src/net/eathena/serverfeatures.h
@@ -36,51 +36,51 @@ class ServerFeatures final : public Net::ServerFeatures
bool haveServerOnlineList() const override final;
- bool haveOnlineList() const override final;
+ bool haveOnlineList() const override final A_CONST;
- bool havePartyNickInvite() const override final;
+ bool havePartyNickInvite() const override final A_CONST;
- bool haveChangePartyLeader() const override final;
+ bool haveChangePartyLeader() const override final A_CONST;
- bool haveServerHp() const override final;
+ bool haveServerHp() const override final A_CONST;
bool havePlayerStatusUpdate() const override final;
- bool haveBrokenPlayerAttackDistance() const override final;
+ bool haveBrokenPlayerAttackDistance() const override final A_CONST;
- bool haveNativeGuilds() const override final;
+ bool haveNativeGuilds() const override final A_CONST;
- bool haveIncompleteChatMessages() const override final;
+ bool haveIncompleteChatMessages() const override final A_CONST;
bool haveRaceSelection() const override final;
bool haveLookSelection() const override final;
- bool haveChatChannels() const override final;
+ bool haveChatChannels() const override final A_CONST;
- bool haveServerIgnore() const override final;
+ bool haveServerIgnore() const override final A_CONST;
bool haveMove3() const override final;
- bool haveItemColors() const override final;
+ bool haveItemColors() const override final A_CONST;
- bool haveAccountOtherGender() const override final;
+ bool haveAccountOtherGender() const override final A_CONST;
bool haveCharOtherGender() const override final;
- bool haveMonsterAttackRange() const override final;
+ bool haveMonsterAttackRange() const override final A_CONST;
- bool haveMonsterName() const override final;
+ bool haveMonsterName() const override final A_CONST;
bool haveEmailOnRegister() const override final;
bool haveEmailOnDelete() const override final;
- bool haveEightDirections() const override final;
+ bool haveEightDirections() const override final A_CONST;
- bool haveCharRename() const override final;
+ bool haveCharRename() const override final A_CONST;
- bool haveBankApi() const override final;
+ bool haveBankApi() const override final A_CONST;
bool haveServerVersion() const override final;
@@ -90,15 +90,15 @@ class ServerFeatures final : public Net::ServerFeatures
bool haveJoinChannel() const override final;
- bool haveNpcWhispers() const override final;
+ bool haveNpcWhispers() const override final A_CONST;
bool haveCreateCharGender() const override final;
- bool haveAttackDirections() const override final;
+ bool haveAttackDirections() const override final A_CONST;
- bool haveVending() const override final;
+ bool haveVending() const override final A_CONST;
- bool haveCart() const override final;
+ bool haveCart() const override final A_CONST;
bool haveTalkPet() const override final;
@@ -106,21 +106,21 @@ class ServerFeatures final : public Net::ServerFeatures
bool haveServerWarpNames() const override final;
- bool haveExpPacket() const override final;
+ bool haveExpPacket() const override final A_CONST;
- bool haveMute() const override final;
+ bool haveMute() const override final A_CONST;
bool haveChangePassword() const override final;
- bool haveTeamId() const override final;
+ bool haveTeamId() const override final A_CONST;
- bool haveNewGuild() const override final;
+ bool haveNewGuild() const override final A_CONST;
bool haveAdvancedSprites() const override final;
bool haveExtendedRiding() const override final;
- bool haveAdvancedBuySell() const override final;
+ bool haveAdvancedBuySell() const override final A_CONST;
bool haveSlide() const override final;
};
diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h
index c7153ee29..84c28678f 100644
--- a/src/net/inventoryhandler.h
+++ b/src/net/inventoryhandler.h
@@ -53,8 +53,6 @@ class InventoryHandler notfinal
virtual void moveItem(const int oldIndex,
const int newIndex) const = 0;
- virtual void openStorage(const int type) const = 0;
-
virtual void closeStorage() const = 0;
virtual void moveItem2(const InventoryTypeT source,
diff --git a/src/net/messageout.h b/src/net/messageout.h
index 39b826dfe..9b6081b14 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -89,7 +89,8 @@ class MessageOut notfinal
virtual ~MessageOut()
{ }
- static unsigned char toServerDirection(unsigned char direction);
+ static unsigned char toServerDirection(unsigned char direction)
+ A_CONST;
protected:
/**
diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h
index 3bc0f0175..98757b1e3 100644
--- a/src/net/tmwa/adminhandler.h
+++ b/src/net/tmwa/adminhandler.h
@@ -43,14 +43,14 @@ class AdminHandler final : public Ea::AdminHandler
void kick(const BeingId playerId) const override final;
- void kickAll() const override final;
+ void kickAll() const override final A_CONST;
void warp(const std::string &map,
const int x, const int y) const override final;
- void resetStats() const override final;
+ void resetStats() const override final A_CONST;
- void resetSkills() const override final;
+ void resetSkills() const override final A_CONST;
void gotoName(const std::string &name) const override final;
@@ -58,18 +58,19 @@ class AdminHandler final : public Ea::AdminHandler
void mute(const Being *const being,
const int type,
- const int limit) const override final;
+ const int limit) const override final A_CONST;
- void muteName(const std::string &name) const override final;
+ void muteName(const std::string &name) const override final A_CONST;
- void requestLogin(const Being *const being) const override final;
+ void requestLogin(const Being *const being) const override final
+ A_CONST;
void setTileType(const int x, const int y,
- const int type) const override final;
+ const int type) const override final A_CONST;
- void unequipAll(const Being *const being) const override final;
+ void unequipAll(const Being *const being) const override final A_CONST;
- void requestStats(const std::string &name) override final;
+ void requestStats(const std::string &name) override final A_CONST;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/auctionhandler.h b/src/net/tmwa/auctionhandler.h
index d4acb42b4..66f8fdece 100644
--- a/src/net/tmwa/auctionhandler.h
+++ b/src/net/tmwa/auctionhandler.h
@@ -34,30 +34,30 @@ class AuctionHandler final : public Net::AuctionHandler
A_DELETE_COPY(AuctionHandler)
- void cancelReg() const override final;
+ void cancelReg() const override final A_CONST;
void setItem(const Item *const item,
- const int amount) const override final;
+ const int amount) const override final A_CONST;
void reg(const int currentPrice,
const int maxPrice,
- const int hours) const override final;
+ const int hours) const override final A_CONST;
- void cancel(const int auctionId) const override final;
+ void cancel(const int auctionId) const override final A_CONST;
- void close(const int auctionId) const override final;
+ void close(const int auctionId) const override final A_CONST;
void bid(const int auctionId,
- const int money) const override final;
+ const int money) const override final A_CONST;
void search(const AuctionSearchTypeT type,
const int auctionId,
const std::string &text,
- const int page) const override final;
+ const int page) const override final A_CONST;
- void buy() const override final;
+ void buy() const override final A_CONST;
- void sell() const override final;
+ void sell() const override final A_CONST;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/bankhandler.h b/src/net/tmwa/bankhandler.h
index dfa9fbb1f..f6777db92 100644
--- a/src/net/tmwa/bankhandler.h
+++ b/src/net/tmwa/bankhandler.h
@@ -35,15 +35,15 @@ class BankHandler final : public Net::BankHandler
A_DELETE_COPY(BankHandler)
- void deposit(const int money) const override final;
+ void deposit(const int money) const override final A_CONST;
- void withdraw(const int money) const override final;
+ void withdraw(const int money) const override final A_CONST;
- void check() const override final;
+ void check() const override final A_CONST;
- void open() const override final;
+ void open() const override final A_CONST;
- void close() const override final;
+ void close() const override final A_CONST;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/battlegroundhandler.h b/src/net/tmwa/battlegroundhandler.h
index 63687fad9..4ed9bf91f 100644
--- a/src/net/tmwa/battlegroundhandler.h
+++ b/src/net/tmwa/battlegroundhandler.h
@@ -36,15 +36,17 @@ class BattleGroundHandler final : public Net::BattleGroundHandler
A_DELETE_COPY(BattleGroundHandler)
void registerBg(const BattleGroundTypeT &type,
- const std::string &name) const override final;
+ const std::string &name) const override final A_CONST;
- void rekoveRequest(const std::string &name) const override final;
+ void rekoveRequest(const std::string &name) const override final
+ A_CONST;
void beginAck(const bool result,
const std::string &bgName,
- const std::string &gameName) const override final;
+ const std::string &gameName) const override final
+ A_CONST;
- void checkState(const std::string &name) const override final;
+ void checkState(const std::string &name) const override final A_CONST;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h
index bb39983d5..0d13ca831 100644
--- a/src/net/tmwa/beinghandler.h
+++ b/src/net/tmwa/beinghandler.h
@@ -40,13 +40,14 @@ class BeingHandler final : public Ea::BeingHandler
void undress(Being *const being) const override final;
#ifdef EATHENA_SUPPORT
- void requestRanks(const RankT rank A_UNUSED) const override final;
+ void requestRanks(const RankT rank A_UNUSED) const override final
+ A_CONST;
#endif
- void requestNameByCharId(const int id) const override final;
+ void requestNameByCharId(const int id) const override final A_CONST;
protected:
- void viewPlayerEquipment(const Being *const being);
+ void viewPlayerEquipment(const Being *const being) A_CONST;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/buyingstorehandler.h b/src/net/tmwa/buyingstorehandler.h
index bfbb71080..031bf6d53 100644
--- a/src/net/tmwa/buyingstorehandler.h
+++ b/src/net/tmwa/buyingstorehandler.h
@@ -38,16 +38,17 @@ class BuyingStoreHandler final : public Net::BuyingStoreHandler
void create(const std::string &name,
const int maxMoney,
const bool flag,
- std::vector<ShopItem*> &items) const override final;
+ std::vector<ShopItem*> &items) const override final
+ A_CONST;
- void close() const override final;
+ void close() const override final A_CONST;
- void open(const Being *const being) const override final;
+ void open(const Being *const being) const override final A_CONST;
void sell(const Being *const being,
const int storeId,
const Item *const item,
- const int amount) const override final;
+ const int amount) const override final A_CONST;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/buysellhandler.h b/src/net/tmwa/buysellhandler.h
index 7ed1b83d4..3fcf6046c 100644
--- a/src/net/tmwa/buysellhandler.h
+++ b/src/net/tmwa/buysellhandler.h
@@ -49,7 +49,7 @@ class BuySellHandler final : public Ea::BuySellHandler
const ShopItem *const item,
const int amount) const override final;
- void close() const override final;
+ void close() const override final A_CONST;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/cashshophandler.h b/src/net/tmwa/cashshophandler.h
index c81ed394e..8cecf92d4 100644
--- a/src/net/tmwa/cashshophandler.h
+++ b/src/net/tmwa/cashshophandler.h
@@ -38,17 +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;
+ const int amount) const override final A_CONST;
- void buyItems(std::vector<ShopItem*> &items) const override final;
+ void buyItems(std::vector<ShopItem*> &items) const override final
+ A_CONST;
- void close() const override final;
+ void close() const override final A_CONST;
- void requestPoints() const override final;
+ void requestPoints() const override final A_CONST;
- void requestTab(const int tab) const override final;
+ void requestTab(const int tab) const override final A_CONST;
- void schedule() const override final;
+ void schedule() const override final A_CONST;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h
index b141fc7bc..f80385edb 100644
--- a/src/net/tmwa/charserverhandler.h
+++ b/src/net/tmwa/charserverhandler.h
@@ -53,7 +53,8 @@ class CharServerHandler final : public Ea::CharServerHandler
const std::string &email) override final;
void renameCharacter(const BeingId id,
- const std::string &newName) override final;
+ const std::string &newName) override final
+ A_CONST;
void switchCharacter() const override final;
@@ -73,11 +74,12 @@ class CharServerHandler final : public Ea::CharServerHandler
void setCharCreateDialog(CharCreateDialog *const window)
override final;
- void changeSlot(const int oldSlot, const int newSlot) override final;
+ void changeSlot(const int oldSlot,
+ const int newSlot) override final A_CONST;
- void ping() const override final;
+ void ping() const override final A_CONST;
- unsigned int hatSprite() const override final A_WARN_UNUSED;
+ unsigned int hatSprite() const override final A_CONST A_WARN_UNUSED;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index ba591225b..770165cfd 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -47,7 +47,7 @@ class ChatHandler final : public Ea::ChatHandler
void channelMessage(const std::string &restrict channel,
const std::string &restrict text) override final;
- void joinChannel(const std::string &channel) override final;
+ void joinChannel(const std::string &channel) override final A_CONST;
void who() const override final;
@@ -60,34 +60,38 @@ class ChatHandler final : public Ea::ChatHandler
void createChatRoom(const std::string &title,
const std::string &password,
const int limit,
- const bool isPublic) override final;
+ const bool isPublic) override final A_CONST;
void ignore(const std::string &nick) const override final;
void unIgnore(const std::string &nick) const override final;
- void requestIgnoreList() const override final;
+ void requestIgnoreList() const override final A_CONST;
- void battleTalk(const std::string &text) const override final;
+ void battleTalk(const std::string &text) const override final A_CONST;
void joinChat(const ChatObject *const chat,
- const std::string &password) const override final;
+ const std::string &password) const override final
+ A_CONST;
- void partChannel(const std::string &channel) override final;
+ void partChannel(const std::string &channel) override final A_CONST;
void talkPet(const std::string &restrict text,
const std::string &restrict channel) const override final;
- void leaveChatRoom() const override final;
+ void leaveChatRoom() const override final A_CONST;
void setChatRoomOptions(const int limit,
const bool isPublic,
const std::string &password,
- const std::string &title) const override final;
+ const std::string &title) const override final
+ A_CONST;
- void setChatRoomOwner(const std::string &nick) const override final;
+ void setChatRoomOwner(const std::string &nick) const override final
+ A_CONST;
- void kickFromChatRoom(const std::string &nick) const override final;
+ void kickFromChatRoom(const std::string &nick) const override final
+ A_CONST;
protected:
static void processRaw(MessageOut &restrict outMsg,
diff --git a/src/net/tmwa/familyhandler.h b/src/net/tmwa/familyhandler.h
index ff6328f65..fe068c303 100644
--- a/src/net/tmwa/familyhandler.h
+++ b/src/net/tmwa/familyhandler.h
@@ -35,9 +35,9 @@ class FamilyHandler final : public Net::FamilyHandler
A_DELETE_COPY(FamilyHandler)
- void askForChild(const Being *const being) override final;
+ void askForChild(const Being *const being) override final A_CONST;
- void askForChildReply(const bool accept) override final;
+ void askForChildReply(const bool accept) override final A_CONST;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/friendshandler.h b/src/net/tmwa/friendshandler.h
index bd223a499..cb751faea 100644
--- a/src/net/tmwa/friendshandler.h
+++ b/src/net/tmwa/friendshandler.h
@@ -34,14 +34,14 @@ class FriendsHandler final : public Net::FriendsHandler
A_DELETE_COPY(FriendsHandler)
- void invite(const std::string &name) const override final;
+ void invite(const std::string &name) const override final A_CONST;
void inviteResponse(const int accountId,
const int charId,
- const bool accept) const override final;
+ const bool accept) const override final A_CONST;
void remove(const int accountId,
- const int charId) const override final;
+ const int charId) const override final A_CONST;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h
index 6b2d0e350..371a33e73 100644
--- a/src/net/tmwa/guildhandler.h
+++ b/src/net/tmwa/guildhandler.h
@@ -66,27 +66,31 @@ class GuildHandler final : public Ea::GuildHandler
void checkMaster() const override final;
- void requestAlliance(const Being *const being) 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;
+ const bool accept) const override final
+ A_CONST;
void endAlliance(const int guildId,
- const int flag) const override final;
+ const int flag) const override final A_CONST;
void changePostionInfo(const int posId,
const int mode,
const int ranking,
const int payRate,
- const std::string &name) const override final;
+ const std::string &name) const override final
+ A_CONST;
- void requestOpposition(const Being *const being) const override final;
+ void requestOpposition(const Being *const being) const override final
+ A_CONST;
- void breakGuild(const std::string &name) const override final;
+ void breakGuild(const std::string &name) const override final A_CONST;
- void changeEmblem(std::string emblem) const override final;
+ void changeEmblem(std::string emblem) const override final A_CONST;
- void requestEmblem(const int guildId) const override final;
+ void requestEmblem(const int guildId) const override final A_CONST;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/homunculushandler.h b/src/net/tmwa/homunculushandler.h
index d5997c3f6..b4b4752c5 100644
--- a/src/net/tmwa/homunculushandler.h
+++ b/src/net/tmwa/homunculushandler.h
@@ -35,24 +35,26 @@ class HomunculusHandler final : public Net::HomunculusHandler
A_DELETE_COPY(HomunculusHandler)
- void setName(const std::string &name) const override final;
+ void setName(const std::string &name) const override final A_CONST;
- void moveToMaster() const override final;
+ void moveToMaster() const override final A_CONST;
- void move(const int x, const int y) const override final;
+ void move(const int x, const int y) const override final A_CONST;
void attack(const BeingId targetId,
- const Keep keep) const override final;
+ const Keep keep) const override final A_CONST;
- void feed() const override final;
+ void feed() const override final A_CONST;
- void fire() const override final;
+ void fire() const override final A_CONST;
- void talk(const std::string &restrict text) const override final;
+ void talk(const std::string &restrict text) const override final
+ A_CONST;
- void emote(const uint8_t emoteId) const override final;
+ void emote(const uint8_t emoteId) const override final A_CONST;
- void setDirection(const unsigned char type) const override final;
+ void setDirection(const unsigned char type) const override final
+ A_CONST;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h
index 81e300bd3..742b59589 100644
--- a/src/net/tmwa/inventoryhandler.h
+++ b/src/net/tmwa/inventoryhandler.h
@@ -53,15 +53,15 @@ class InventoryHandler final : public Ea::InventoryHandler
const int amount,
const InventoryTypeT destination) const override final;
- void useCard(const Item *const item) override final;
+ void useCard(const Item *const item) override final A_CONST;
void insertCard(const int cardIndex,
- const int itemIndex) const override final;
+ const int itemIndex) const override final A_CONST;
void favoriteItem(const Item *const item,
- const bool favorite) const override final;
+ const bool favorite) const override final A_CONST;
- void selectEgg(const Item *const item) const override final;
+ void selectEgg(const Item *const item) const override final A_CONST;
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 0f7adec48..ed167bb8c 100644
--- a/src/net/tmwa/loginhandler.h
+++ b/src/net/tmwa/loginhandler.h
@@ -50,13 +50,13 @@ class LoginHandler final : public Ea::LoginHandler
const std::string &restrict newPassword)
const override final;
- ServerInfo *getCharServer() const override final A_WARN_UNUSED;
+ ServerInfo *getCharServer() const override final A_CONST A_WARN_UNUSED;
- void sendVersion() const override final;
+ void sendVersion() const override final A_CONST;
- void ping() const override final;
+ void ping() const override final A_CONST;
- static void requestUpdateHosts();
+ static void requestUpdateHosts() A_CONST;
private:
void sendLoginRegister(const std::string &restrict username,
diff --git a/src/net/tmwa/mailhandler.h b/src/net/tmwa/mailhandler.h
index 7278f85c5..f184baedd 100644
--- a/src/net/tmwa/mailhandler.h
+++ b/src/net/tmwa/mailhandler.h
@@ -35,25 +35,26 @@ class MailHandler final : public Net::MailHandler
A_DELETE_COPY(MailHandler)
- void refresh() const override final;
+ void refresh() const override final A_CONST;
- void readMessage(const int msgId) const override final;
+ void readMessage(const int msgId) const override final A_CONST;
- void getAttach(const int msgId) const override final;
+ void getAttach(const int msgId) const override final A_CONST;
- void deleteMessage(const int msgId) const override final;
+ void deleteMessage(const int msgId) const override final A_CONST;
- void returnMessage(const int msgId) const override final;
+ void returnMessage(const int msgId) const override final A_CONST;
- void setAttach(const int index, const int amount) const override final;
+ void setAttach(const int index,
+ const int amount) const override final A_CONST;
- void setAttachMoney(const int money) const override final;
+ void setAttachMoney(const int money) const override final A_CONST;
- void resetAttach(const int flag) const override final;
+ void resetAttach(const int flag) const override final A_CONST;
void send(const std::string &name,
const std::string &title,
- std::string message) const override final;
+ std::string message) const override final A_CONST;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/markethandler.h b/src/net/tmwa/markethandler.h
index 9cd4b0b8b..9fe97a91c 100644
--- a/src/net/tmwa/markethandler.h
+++ b/src/net/tmwa/markethandler.h
@@ -34,14 +34,15 @@ class MarketHandler final : public Net::MarketHandler
A_DELETE_COPY(MarketHandler)
- void close() override final;
+ void close() override final A_CONST;
void buyItem(const int itemId,
const int type,
const ItemColor color,
- const int amount) const override final;
+ const int amount) const override final A_CONST;
- void buyItems(std::vector<ShopItem*> &items) const override final;
+ void buyItems(std::vector<ShopItem*> &items) const override final
+ A_CONST;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/mercenaryhandler.h b/src/net/tmwa/mercenaryhandler.h
index 58f119e99..2c1bbc99f 100644
--- a/src/net/tmwa/mercenaryhandler.h
+++ b/src/net/tmwa/mercenaryhandler.h
@@ -35,20 +35,22 @@ class MercenaryHandler final : public Net::MercenaryHandler
A_DELETE_COPY(MercenaryHandler)
- void fire() override final;
+ void fire() override final A_CONST;
- void moveToMaster() const override final;
+ void moveToMaster() const override final A_CONST;
- void move(const int x, const int y) const override final;
+ void move(const int x, const int y) const override final A_CONST;
void attack(const BeingId targetId,
- const Keep keep) const override final;
+ const Keep keep) const override final A_CONST;
- void talk(const std::string &restrict text) const override final;
+ void talk(const std::string &restrict text) const override final
+ A_CONST;
- void emote(const uint8_t emoteId) const override final;
+ void emote(const uint8_t emoteId) const override final A_CONST;
- void setDirection(const unsigned char type) const override final;
+ void setDirection(const unsigned char type) const override final
+ A_CONST;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index 5275feeb4..dfb2340c4 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -59,15 +59,17 @@ class NpcHandler final : public Ea::NpcHandler
const ItemColor color,
const int amount) const override final;
- void buyItems(std::vector<ShopItem*> &items) const override final;
+ void buyItems(std::vector<ShopItem*> &items) const override final
+ A_CONST;
void sellItem(const BeingId beingId,
const int itemId,
const int amount) const override final;
- void sellItems(std::vector<ShopItem*> &items) const override final;
+ void sellItems(std::vector<ShopItem*> &items) const override final
+ A_CONST;
- void completeProgressBar() const override final;
+ void completeProgressBar() const override final A_CONST;
BeingId getNpc(Net::MessageIn &msg,
const NpcActionT action) override final;
@@ -75,22 +77,22 @@ class NpcHandler final : public Ea::NpcHandler
void produceMix(const int nameId,
const int materialId1,
const int materialId2,
- const int materialId3) const override final;
+ const int materialId3) const override final A_CONST;
#ifdef EATHENA_SUPPORT
void cooking(const CookingTypeT type,
- const int nameId) const override final;
+ const int nameId) const override final A_CONST;
#endif
- void repair(const int index) const override final;
+ void repair(const int index) const override final A_CONST;
- void refine(const int index) const override final;
+ void refine(const int index) const override final A_CONST;
- void identify(const int index) const override final;
+ void identify(const int index) const override final A_CONST;
- void selectArrow(const int nameId) const override final;
+ void selectArrow(const int nameId) const override final A_CONST;
- void selectAutoSpell(const int skillId) const override final;
+ void selectAutoSpell(const int skillId) const override final A_CONST;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h
index 5d4ca18ae..e6ef7e2da 100644
--- a/src/net/tmwa/partyhandler.h
+++ b/src/net/tmwa/partyhandler.h
@@ -55,9 +55,10 @@ class PartyHandler final : public Ea::PartyHandler
void setShareItems(const PartyShareT share) const override final;
- void changeLeader(const std::string &name) const override final;
+ void changeLeader(const std::string &name) const override final
+ A_CONST;
- void allowInvite(const bool allow) const override final;
+ void allowInvite(const bool allow) const override final A_CONST;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/pethandler.h b/src/net/tmwa/pethandler.h
index 23428edf8..62e54fed9 100644
--- a/src/net/tmwa/pethandler.h
+++ b/src/net/tmwa/pethandler.h
@@ -38,26 +38,26 @@ class PetHandler final : public Net::PetHandler
void spawn(const Being *const being,
const int petId,
- const int x, const int y) const override final;
+ const int x, const int y) const override final A_CONST;
void emote(const uint8_t emoteId,
const int petId) override final;
- void catchPet(const Being *const being) const override final;
+ void catchPet(const Being *const being) const override final A_CONST;
- void sendPetMessage(const int data) const override final;
+ void sendPetMessage(const int data) const override final A_CONST;
- void setName(const std::string &name) const override final;
+ void setName(const std::string &name) const override final A_CONST;
- void requestStatus() const override final;
+ void requestStatus() const override final A_CONST;
- void feed() const override final;
+ void feed() const override final A_CONST;
- void dropLoot() const override final;
+ void dropLoot() const override final A_CONST;
- void returnToEgg() const override final;
+ void returnToEgg() const override final A_CONST;
- void unequip() const override final;
+ void unequip() const override final A_CONST;
void setDirection(const unsigned char type) const override final;
diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h
index 89dc609c4..72f1d1105 100644
--- a/src/net/tmwa/playerhandler.h
+++ b/src/net/tmwa/playerhandler.h
@@ -49,31 +49,31 @@ 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;
- void updateStatus(const uint8_t status) const override final;
+ void requestOnlineList() const override final A_CONST;
+ void updateStatus(const uint8_t status) const override final A_CONST;
void respawn() const override final;
void setShortcut(const int idx,
const uint8_t type,
const int id,
- const int level) const override final;
+ const int level) const override final A_CONST;
- void removeOption() const override final;
+ void removeOption() const override final A_CONST;
- void changeCart(const int type) const override final;
+ void changeCart(const int type) const override final A_CONST;
- void setMemo() const override final;
+ void setMemo() const override final A_CONST;
- void doriDori() const override final;
+ void doriDori() const override final A_CONST;
- void explosionSpirits() const override final;
+ void explosionSpirits() const override final A_CONST;
- void requestPvpInfo() const override final;
+ void requestPvpInfo() const override final A_CONST;
- void revive() const override final;
+ void revive() const override final A_CONST;
- void setViewEquipment(const bool allow) const override final;
+ void setViewEquipment(const bool allow) const override final A_CONST;
void setStat(Net::MessageIn &msg,
const int type,
diff --git a/src/net/tmwa/questhandler.h b/src/net/tmwa/questhandler.h
index 60577bf0a..4e547bf29 100644
--- a/src/net/tmwa/questhandler.h
+++ b/src/net/tmwa/questhandler.h
@@ -34,7 +34,8 @@ class QuestHandler final : public Net::QuestHandler
A_DELETE_COPY(QuestHandler)
void setQeustActiveState(const int questId,
- const bool active) const override final;
+ const bool active) const override final
+ A_CONST;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/searchstorehandler.h b/src/net/tmwa/searchstorehandler.h
index 183d1084a..2a1ab764f 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;
+ const int itemId) const override final A_CONST;
- void nextPage() const override final;
+ void nextPage() const override final A_CONST;
- void close() const override final;
+ void close() const override final A_CONST;
void select(const int accountId,
const int storeId,
- const int itemId) const override final;
+ const int itemId) const override final A_CONST;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h
index afddb4c13..cdf6eb6de 100644
--- a/src/net/tmwa/serverfeatures.h
+++ b/src/net/tmwa/serverfeatures.h
@@ -34,95 +34,95 @@ class ServerFeatures final : public Net::ServerFeatures
A_DELETE_COPY(ServerFeatures)
- bool haveServerOnlineList() const override final;
+ bool haveServerOnlineList() const override final A_CONST;
- bool haveOnlineList() const override final;
+ bool haveOnlineList() const override final A_CONST;
- bool havePartyNickInvite() const override final;
+ bool havePartyNickInvite() const override final A_CONST;
- bool haveChangePartyLeader() const override final;
+ bool haveChangePartyLeader() const override final A_CONST;
bool haveServerHp() const override final;
- bool havePlayerStatusUpdate() const override final;
+ bool havePlayerStatusUpdate() const override final A_CONST;
- bool haveBrokenPlayerAttackDistance() const override final;
+ bool haveBrokenPlayerAttackDistance() const override final A_CONST;
bool haveNativeGuilds() const override final;
bool haveIncompleteChatMessages() const override final;
- bool haveRaceSelection() const override final;
+ bool haveRaceSelection() const override final A_CONST;
- bool haveLookSelection() const override final;
+ bool haveLookSelection() const override final A_CONST;
- bool haveChatChannels() const override final;
+ bool haveChatChannels() const override final A_CONST;
bool haveServerIgnore() const override final;
bool haveMove3() const override final;
- bool haveItemColors() const override final;
+ bool haveItemColors() const override final A_CONST;
- bool haveAccountOtherGender() const override final;
+ bool haveAccountOtherGender() const override final A_CONST;
bool haveCharOtherGender() const override final;
bool haveMonsterAttackRange() const override final;
- bool haveMonsterName() const override final;
+ bool haveMonsterName() const override final A_CONST;
- bool haveEmailOnRegister() const override final;
+ bool haveEmailOnRegister() const override final A_CONST;
- bool haveEmailOnDelete() const override final;
+ bool haveEmailOnDelete() const override final A_CONST;
- bool haveEightDirections() const override final;
+ bool haveEightDirections() const override final A_CONST;
- bool haveCharRename() const override final;
+ bool haveCharRename() const override final A_CONST;
- bool haveBankApi() const override final;
+ bool haveBankApi() const override final A_CONST;
- bool haveServerVersion() const override final;
+ bool haveServerVersion() const override final A_CONST;
- bool haveMapServerVersion() const override final;
+ bool haveMapServerVersion() const override final A_CONST;
bool haveNpcGender() const override final;
- bool haveJoinChannel() const override final;
+ bool haveJoinChannel() const override final A_CONST;
- bool haveNpcWhispers() const override final;
+ bool haveNpcWhispers() const override final A_CONST;
bool haveCreateCharGender() const override final;
- bool haveAttackDirections() const override final;
+ bool haveAttackDirections() const override final A_CONST;
- bool haveVending() const override final;
+ bool haveVending() const override final A_CONST;
- bool haveCart() const override final;
+ bool haveCart() const override final A_CONST;
- bool haveTalkPet() const override final;
+ bool haveTalkPet() const override final A_CONST;
- bool haveMovePet() const override final;
+ bool haveMovePet() const override final A_CONST;
- bool haveServerWarpNames() const override final;
+ bool haveServerWarpNames() const override final A_CONST;
- bool haveExpPacket() const override final;
+ bool haveExpPacket() const override final A_CONST;
- bool haveMute() const override final;
+ bool haveMute() const override final A_CONST;
- bool haveChangePassword() const override final;
+ bool haveChangePassword() const override final A_CONST;
bool haveTeamId() const override final;
bool haveNewGuild() const override final;
- bool haveAdvancedSprites() const override final;
+ bool haveAdvancedSprites() const override final A_CONST;
- bool haveExtendedRiding() const override final;
+ bool haveExtendedRiding() const override final A_CONST;
- bool haveAdvancedBuySell() const override final;
+ bool haveAdvancedBuySell() const override final A_CONST;
- bool haveSlide() const override final;
+ bool haveSlide() const override final A_CONST;
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/vendinghandler.h b/src/net/tmwa/vendinghandler.h
index 36b6031df..1e0fdd0bb 100644
--- a/src/net/tmwa/vendinghandler.h
+++ b/src/net/tmwa/vendinghandler.h
@@ -35,22 +35,23 @@ class VendingHandler final : public Net::VendingHandler
A_DELETE_COPY(VendingHandler)
- void close() const override final;
+ void close() const override final A_CONST;
- void open(const Being *const being) const override final;
+ void open(const Being *const being) const override final A_CONST;
void buy(const Being *const being,
const int index,
- const int amount) const override final;
+ const int amount) const override final A_CONST;
void buy2(const Being *const being,
const int vendId,
const int index,
- const int amount) const override final;
+ const int amount) const override final A_CONST;
void createShop(const std::string &name,
const bool flag,
- std::vector<ShopItem*> &items) const override final;
+ std::vector<ShopItem*> &items) const override final
+ A_CONST;
};
} // namespace TmwAthena