diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-04-14 17:06:02 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-04-14 17:06:02 +0300 |
commit | 6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d (patch) | |
tree | f1acb027394af1aec49790354df97da4665488b7 /src/net/tmwa | |
parent | a7d7346b9eb3fa62a8912e31d5c00f8e05390425 (diff) | |
download | mv-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.tar.gz mv-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.tar.bz2 mv-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.tar.xz mv-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.zip |
another fixes from cpplint.
Diffstat (limited to 'src/net/tmwa')
-rw-r--r-- | src/net/tmwa/adminhandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/beinghandler.cpp | 2 | ||||
-rw-r--r-- | src/net/tmwa/beinghandler.h | 4 | ||||
-rw-r--r-- | src/net/tmwa/buysellhandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/charserverhandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/chathandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/gamehandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/generalhandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/gui/guildtab.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/gui/partytab.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/guildhandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/inventoryhandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/itemhandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/loginhandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/messagehandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/messagein.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/messageout.h | 4 | ||||
-rw-r--r-- | src/net/tmwa/network.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/npchandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/partyhandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/playerhandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/protocol.h | 23 | ||||
-rw-r--r-- | src/net/tmwa/questhandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/skillhandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/tradehandler.h | 2 |
25 files changed, 38 insertions, 37 deletions
diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h index 621bf6466..d3bb2ed0e 100644 --- a/src/net/tmwa/adminhandler.h +++ b/src/net/tmwa/adminhandler.h @@ -53,4 +53,4 @@ class AdminHandler final : public MessageHandler, public Ea::AdminHandler } // namespace TmwAthena -#endif // NET_TA_ADMINHANDLER_H +#endif // NET_TA_ADMINHANDLER_H diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index 07cef46fd..d70dfb16d 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -57,7 +57,7 @@ extern Net::BeingHandler *beingHandler; namespace TmwAthena { -BeingHandler::BeingHandler(bool enableSync) : +BeingHandler::BeingHandler(const bool enableSync) : MessageHandler(), Ea::BeingHandler(enableSync) { diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h index 2aafcc699..6cb6b447e 100644 --- a/src/net/tmwa/beinghandler.h +++ b/src/net/tmwa/beinghandler.h @@ -36,7 +36,7 @@ namespace TmwAthena class BeingHandler final : public MessageHandler, public Ea::BeingHandler { public: - BeingHandler(bool enableSync); + explicit BeingHandler(const bool enableSync); A_DELETE_COPY(BeingHandler) @@ -58,4 +58,4 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler } // namespace TmwAthena -#endif // NET_TA_BEINGHANDLER_H +#endif // NET_TA_BEINGHANDLER_H diff --git a/src/net/tmwa/buysellhandler.h b/src/net/tmwa/buysellhandler.h index a74272816..f3f36e5b3 100644 --- a/src/net/tmwa/buysellhandler.h +++ b/src/net/tmwa/buysellhandler.h @@ -48,4 +48,4 @@ class BuySellHandler final : public MessageHandler, public Ea::BuySellHandler } // namespace TmwAthena -#endif // NET_TA_BUYSELLHANDLER_H +#endif // NET_TA_BUYSELLHANDLER_H diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h index a4fc5c572..ab2a9e587 100644 --- a/src/net/tmwa/charserverhandler.h +++ b/src/net/tmwa/charserverhandler.h @@ -72,4 +72,4 @@ class CharServerHandler final : public MessageHandler, } // namespace TmwAthena -#endif // NET_TA_CHARSERVERHANDLER_H +#endif // NET_TA_CHARSERVERHANDLER_H diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h index b9a0e71bc..2e1c16d93 100644 --- a/src/net/tmwa/chathandler.h +++ b/src/net/tmwa/chathandler.h @@ -63,4 +63,4 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler } // namespace TmwAthena -#endif // NET_TA_CHATHANDLER_H +#endif // NET_TA_CHATHANDLER_H diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h index 37b1d0570..142c644ea 100644 --- a/src/net/tmwa/gamehandler.h +++ b/src/net/tmwa/gamehandler.h @@ -62,4 +62,4 @@ class GameHandler final : public MessageHandler, public Ea::GameHandler } // namespace TmwAthena -#endif // NET_TA_MAPHANDLER_H +#endif // NET_TA_MAPHANDLER_H diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h index 145da6793..ea9952fa2 100644 --- a/src/net/tmwa/generalhandler.h +++ b/src/net/tmwa/generalhandler.h @@ -82,4 +82,4 @@ class GeneralHandler final : public MessageHandler, } // namespace TmwAthena -#endif // NET_TA_GENERALHANDLER_H +#endif // NET_TA_GENERALHANDLER_H diff --git a/src/net/tmwa/gui/guildtab.h b/src/net/tmwa/gui/guildtab.h index 950c6ad10..b3729fc5a 100644 --- a/src/net/tmwa/gui/guildtab.h +++ b/src/net/tmwa/gui/guildtab.h @@ -34,7 +34,7 @@ namespace TmwAthena class GuildTab : public Ea::GuildTab { public: - GuildTab(const Widget2 *const widget); + explicit GuildTab(const Widget2 *const widget); A_DELETE_COPY(GuildTab) diff --git a/src/net/tmwa/gui/partytab.h b/src/net/tmwa/gui/partytab.h index 08ac9bad7..af6e63338 100644 --- a/src/net/tmwa/gui/partytab.h +++ b/src/net/tmwa/gui/partytab.h @@ -34,7 +34,7 @@ namespace TmwAthena class PartyTab : public Ea::PartyTab { public: - PartyTab(const Widget2 *const widget); + explicit PartyTab(const Widget2 *const widget); A_DELETE_COPY(PartyTab) diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h index 581c9bc2f..d084350f2 100644 --- a/src/net/tmwa/guildhandler.h +++ b/src/net/tmwa/guildhandler.h @@ -74,4 +74,4 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler extern Guild *taGuild; } -#endif // NET_TA_GUILDHANDLER_H +#endif // namespace TmwAthena diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h index 124aedd2f..365951d08 100644 --- a/src/net/tmwa/inventoryhandler.h +++ b/src/net/tmwa/inventoryhandler.h @@ -62,4 +62,4 @@ class InventoryHandler final : public MessageHandler, } // namespace TmwAthena -#endif // NET_TA_INVENTORYHANDLER_H +#endif // NET_TA_INVENTORYHANDLER_H diff --git a/src/net/tmwa/itemhandler.h b/src/net/tmwa/itemhandler.h index a343b4e8d..00c825588 100644 --- a/src/net/tmwa/itemhandler.h +++ b/src/net/tmwa/itemhandler.h @@ -42,4 +42,4 @@ class ItemHandler final : public MessageHandler, public Ea::ItemHandler } // namespace TmwAthena -#endif // NET_TA_ITEMHANDLER_H +#endif // NET_TA_ITEMHANDLER_H diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h index c327b558b..c1326f274 100644 --- a/src/net/tmwa/loginhandler.h +++ b/src/net/tmwa/loginhandler.h @@ -78,4 +78,4 @@ class LoginHandler final : public MessageHandler, public Ea::LoginHandler } // namespace TmwAthena -#endif // NET_TA_LOGINHANDLER_H +#endif // NET_TA_LOGINHANDLER_H diff --git a/src/net/tmwa/messagehandler.h b/src/net/tmwa/messagehandler.h index 79073ffb2..9fd27c8ed 100644 --- a/src/net/tmwa/messagehandler.h +++ b/src/net/tmwa/messagehandler.h @@ -58,4 +58,4 @@ typedef const std::auto_ptr<MessageHandler> MessageHandlerPtr; } -#endif // NET_TA_MESSAGEHANDLER_H +#endif // namespace TmwAthena diff --git a/src/net/tmwa/messagein.h b/src/net/tmwa/messagein.h index a5db62334..6fc337ae3 100644 --- a/src/net/tmwa/messagein.h +++ b/src/net/tmwa/messagein.h @@ -54,4 +54,4 @@ class MessageIn final : public Net::MessageIn } -#endif // NET_TA_MESSAGEIN_H +#endif // namespace TmwAthena diff --git a/src/net/tmwa/messageout.h b/src/net/tmwa/messageout.h index 285e333d0..22a6ae458 100644 --- a/src/net/tmwa/messageout.h +++ b/src/net/tmwa/messageout.h @@ -46,7 +46,7 @@ class MessageOut final : public Net::MessageOut /** * Constructor. */ - MessageOut(const short id); + explicit MessageOut(const short id); A_DELETE_COPY(MessageOut) @@ -72,4 +72,4 @@ class MessageOut final : public Net::MessageOut } -#endif // NET_TA_MESSAGEOUT_H +#endif // namespace TmwAthena diff --git a/src/net/tmwa/network.h b/src/net/tmwa/network.h index 54d082cb5..521a532a2 100644 --- a/src/net/tmwa/network.h +++ b/src/net/tmwa/network.h @@ -69,4 +69,4 @@ class Network final : public Ea::Network } // namespace TmwAthena -#endif // NET_TA_NETWORK_H +#endif // NET_TA_NETWORK_H diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h index db7d5ade1..53008f615 100644 --- a/src/net/tmwa/npchandler.h +++ b/src/net/tmwa/npchandler.h @@ -84,4 +84,4 @@ class NpcHandler final : public MessageHandler, public Ea::NpcHandler } // namespace TmwAthena -#endif // NET_TA_NPCHANDLER_H +#endif // NET_TA_NPCHANDLER_H diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h index 0d1ca1f38..bdc945e7e 100644 --- a/src/net/tmwa/partyhandler.h +++ b/src/net/tmwa/partyhandler.h @@ -67,4 +67,4 @@ class PartyHandler final : public MessageHandler, public Ea::PartyHandler } // namespace TmwAthena -#endif // NET_TA_PARTYHANDLER_H +#endif // NET_TA_PARTYHANDLER_H diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h index b8f019d2c..a0c355c40 100644 --- a/src/net/tmwa/playerhandler.h +++ b/src/net/tmwa/playerhandler.h @@ -63,4 +63,4 @@ class PlayerHandler final : public MessageHandler, public Ea::PlayerHandler } // namespace TmwAthena -#endif // NET_TA_PLAYERHANDLER_H +#endif // NET_TA_PLAYERHANDLER_H diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h index f40599fa5..86f78c45d 100644 --- a/src/net/tmwa/protocol.h +++ b/src/net/tmwa/protocol.h @@ -47,7 +47,7 @@ namespace TmwAthena // KARMA, // MANNER }; -} +} // namespace TmwAthena enum { @@ -92,8 +92,9 @@ enum #define SMSG_CHAR_DELETE_SUCCEEDED 0x006f #define SMSG_CHAR_DELETE_FAILED 0x0070 #define SMSG_CHAR_MAP_INFO 0x0071 -#define SMSG_CHAR_PASSWORD_RESPONSE 0x0062 /**< Custom packet reply \ - to password change request */ + +// Custom packet reply to password change request +#define SMSG_CHAR_PASSWORD_RESPONSE 0x0062 #define SMSG_CHAR_SWITCH_RESPONSE 0x00b3 #define SMSG_CHANGE_MAP_SERVER 0x0092 @@ -137,8 +138,8 @@ enum #define SMSG_BEING_MOVE2 0x0086 /**< New eAthena being moves */ #define SMSG_BEING_REMOVE 0x0080 #define SMSG_BEING_CHANGE_LOOKS 0x00c3 -#define SMSG_BEING_CHANGE_LOOKS2 0x01d7 /**< Same as 0x00c3, \ - but 16 bit ID */ +// Same as 0x00c3, but 16 bit ID +#define SMSG_BEING_CHANGE_LOOKS2 0x01d7 #define SMSG_BEING_SELFEFFECT 0x019b #define SMSG_BEING_EMOTION 0x00c0 #define SMSG_BEING_ACTION 0x008a /**< Attack, sit, stand up, ... */ @@ -171,8 +172,8 @@ enum #define SMSG_GM_CHAT 0x009a /**< GM announce */ #define SMSG_WALK_RESPONSE 0x0087 -#define SMSG_TRADE_REQUEST 0x00e5 /**< Receiving a request \ - to trade */ +// Receiving a request to trade +#define SMSG_TRADE_REQUEST 0x00e5 #define SMSG_TRADE_RESPONSE 0x00e7 #define SMSG_TRADE_ITEM_ADD 0x00e9 #define SMSG_TRADE_ITEM_ADD_RESPONSE 0x01b1 /**< Not standard eAthena! */ @@ -195,8 +196,8 @@ enum #define SMSG_PLAYER_STORAGE_EQUIP 0x00a6 /**< Equipment list for storage */ #define SMSG_PLAYER_STORAGE_STATUS 0x00f2 /**< Slots used and total slots */ #define SMSG_PLAYER_STORAGE_ADD 0x00f4 /**< Add item/equip to storage */ -#define SMSG_PLAYER_STORAGE_REMOVE 0x00f6 /**< Remove item/equip \ - from storage */ +// Remove item/equip from storage +#define SMSG_PLAYER_STORAGE_REMOVE 0x00f6 #define SMSG_PLAYER_STORAGE_CLOSE 0x00f8 /**< Storage access closed */ #define SMSG_ADMIN_KICK_ACK 0x00cd @@ -235,8 +236,8 @@ enum **********************************/ #define CMSG_SERVER_VERSION_REQUEST 0x7530 -#define CMSG_CHAR_PASSWORD_CHANGE 0x0061 /**< Custom change \ - password packet */ +// Custom change password packet +#define CMSG_CHAR_PASSWORD_CHANGE 0x0061 #define CMSG_CHAR_SERVER_CONNECT 0x0065 #define CMSG_CHAR_SELECT 0x0066 #define CMSG_CHAR_CREATE 0x0067 diff --git a/src/net/tmwa/questhandler.h b/src/net/tmwa/questhandler.h index f87b27cc0..e24a48f53 100644 --- a/src/net/tmwa/questhandler.h +++ b/src/net/tmwa/questhandler.h @@ -49,4 +49,4 @@ class QuestHandler final : public MessageHandler } // namespace TmwAthena -#endif // NET_TA_QUESTHANDLER_H +#endif // NET_TA_QUESTHANDLER_H diff --git a/src/net/tmwa/skillhandler.h b/src/net/tmwa/skillhandler.h index 2dcd60540..b410aff04 100644 --- a/src/net/tmwa/skillhandler.h +++ b/src/net/tmwa/skillhandler.h @@ -53,4 +53,4 @@ class SkillHandler final : public MessageHandler, public Ea::SkillHandler } // namespace TmwAthena -#endif // NET_TA_SKILLHANDLER_H +#endif // NET_TA_SKILLHANDLER_H diff --git a/src/net/tmwa/tradehandler.h b/src/net/tmwa/tradehandler.h index 6a4f8f59d..491139369 100644 --- a/src/net/tmwa/tradehandler.h +++ b/src/net/tmwa/tradehandler.h @@ -59,4 +59,4 @@ class TradeHandler final : public MessageHandler, public Ea::TradeHandler } // namespace TmwAthena -#endif // NET_TA_TRADEHANDLER_H +#endif // NET_TA_TRADEHANDLER_H |