diff options
| -rw-r--r-- | src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/net/eathena/packetsin.inc (renamed from src/net/eathena/packets.inc) | 252 | ||||
| -rw-r--r-- | src/net/eathena/packetsout.inc | 268 | ||||
| -rw-r--r-- | src/net/eathena/protocol.h | 5 | ||||
| -rw-r--r-- | src/net/eathena/recvpackets.inc | 4 | ||||
| -rw-r--r-- | src/net/tmwa/packetsin.inc (renamed from src/net/tmwa/packets.inc) | 108 | ||||
| -rw-r--r-- | src/net/tmwa/packetsout.inc | 125 | ||||
| -rw-r--r-- | src/net/tmwa/protocol.h | 5 | ||||
| -rw-r--r-- | src/net/tmwa/recvpackets.inc | 4 |
10 files changed, 416 insertions, 367 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9b350f5e3..69b6a2efb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1468,7 +1468,8 @@ SET(SRCS_TMWA net/tmwa/npchandler.cpp net/tmwa/npchandler.h net/tmwa/packets.h - net/tmwa/packets.inc + net/tmwa/packetsin.inc + net/tmwa/packetsout.inc net/tmwa/partyhandler.cpp net/tmwa/partyhandler.h net/tmwa/partyrecv.cpp @@ -1691,7 +1692,8 @@ SET(SRCS_EATHENA net/eathena/npcrecv.cpp net/eathena/npcrecv.h net/eathena/packets.h - net/eathena/packets.inc + net/eathena/packetsin.inc + net/eathena/packetsout.inc net/eathena/partyhandler.cpp net/eathena/partyhandler.h net/eathena/partyrecv.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 929866e66..7fb295d0b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1311,7 +1311,8 @@ manaplus_SOURCES += \ net/tmwa/npchandler.cpp \ net/tmwa/npchandler.h \ net/tmwa/packets.h \ - net/tmwa/packets.inc \ + net/tmwa/packetsin.inc \ + net/tmwa/packetsout.inc \ net/tmwa/partyhandler.cpp \ net/tmwa/partyhandler.h \ net/tmwa/partyrecv.cpp \ @@ -1537,7 +1538,8 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \ net/eathena/npcrecv.cpp \ net/eathena/npcrecv.h \ net/eathena/packets.h \ - net/eathena/packets.inc \ + net/eathena/packetsin.inc \ + net/eathena/packetsout.inc \ net/eathena/partyhandler.cpp \ net/eathena/partyhandler.h \ net/eathena/partyrecv.cpp \ diff --git a/src/net/eathena/packets.inc b/src/net/eathena/packetsin.inc index 2a2405674..c2051b1ea 100644 --- a/src/net/eathena/packets.inc +++ b/src/net/eathena/packetsin.inc @@ -474,260 +474,8 @@ packet(SMSG_ROULETTE_GENERATE_ACK_TYPE, 0x0a20); packet(SMSG_MARRIAGE_PROPOSAL_OUTDATED, 0x01e2); packet(SMSG_MARRIAGE_PROCESS_OUTDATED, 0x01e4); -/********************************** - * Packets from client to server * - **********************************/ - -packet(CMSG_SERVER_VERSION_REQUEST, 0x7530); - -packet(CMSG_LOGIN_REGISTER, 0x0064); -packet(CMSG_LOGIN_REGISTER2, 0x027c); -packet(CMSG_NAME_REQUEST, 0x088a); - -packet(CMSG_CHAR_PASSWORD_CHANGE, 0x0061); -packet(CMSG_CHAR_SERVER_CONNECT, 0x0065); -packet(CMSG_CHAR_SELECT, 0x0066); -packet(CMSG_CHAR_CREATE, 0x0970); -packet(CMSG_CHAR_DELETE, 0x0068); -packet(CMSG_CHAR_CREATE_PIN, 0x08ba); -packet(CMSG_CHAR_CHECK_RENAME, 0x08fc); -packet(CMSG_CHAR_RENAME, 0x028f); -packet(CMSG_CHAR_CHANGE_SLOT, 0x08d4); - -packet(CMSG_MAP_SERVER_CONNECT, 0x089c); -packet(CMSG_MAP_PING, 0x035f); /**< Send to server with tick */ -packet(CMSG_LOGIN_PING, 0x0200); -packet(CMSG_CHAR_PING, 0x0187); -packet(CMSG_MAP_LOADED, 0x007d); -packet(CMSG_CLIENT_QUIT, 0x018A); - -packet(CMSG_CHAT_MESSAGE, 0x00f3); -packet(CMSG_CHAT_WHISPER, 0x0096); -packet(CMSG_CHAT_WHO, 0x00c1); -packet(CMSG_CHAT_ROOM_JOIN, 0x00d9); -packet(CMSG_CHAT_JOIN_CHANNEL, 0x0b07); -packet(CMSG_CHAT_PART_CHANNEL, 0x0b09); -packet(CMSG_BATTLE_CHAT_MESSAGE, 0x02db); - -packet(CMSG_BATTLE_REGISTER, 0x08d7); -packet(CMSG_BATTLE_REVOKE, 0x08da); -packet(CMSG_BATTLE_BEGIN_ACK, 0x08e0); -packet(CMSG_BATTLE_CHECK_STATE, 0x090a); - -packet(CMSG_CREAYE_CHAT_ROOM, 0x00d5); -packet(CMSG_LEAVE_CHAT_ROOM, 0x00e3); -packet(CMSG_SET_CHAT_ROOM_OPTIONS, 0x00de); -packet(CMSG_SET_CHAT_ROOM_OWNER, 0x00e0); -packet(CMSG_KICK_FROM_CHAT_ROOM, 0x00e2); - -packet(CMSG_SKILL_LEVELUP_REQUEST, 0x0112); -packet(CMSG_STAT_UPDATE_REQUEST, 0x00bb); -packet(CMSG_SKILL_USE_BEING, 0x083c); -packet(CMSG_SKILL_USE_POSITION, 0x0436); -// Variant of 0x116 with 80 char string at end (unsure of use) -packet(CMSG_SKILL_USE_POSITION_MORE, 0x0366); -packet(CMSG_SKILL_USE_MAP, 0x011b); - -packet(CMSG_PLAYER_INVENTORY_USE, 0x0439); -packet(CMSG_PLAYER_INVENTORY_DROP, 0x0362); -packet(CMSG_PLAYER_EQUIP, 0x0998); -packet(CMSG_PLAYER_UNEQUIP, 0x00ab); -packet(CMSG_PLAYER_USE_CARD, 0x017a); -packet(CMSG_PLAYER_INSERT_CARD, 0x017c); -packet(CMSG_PLAYER_VIEW_EQUIPMENT, 0x02d6); -packet(CMSG_PLAYER_SET_EQUIPMENT_VISIBLE, 0x02d8); -packet(CMSG_PLAYER_FAVORITE_ITEM, 0x0907); - -packet(CMSG_ITEM_PICKUP, 0x07e4); -packet(CMSG_PLAYER_CHANGE_DIR, 0x0202); -packet(CMSG_PLAYER_CHANGE_DEST, 0x0437); -packet(CMSG_PLAYER_CHANGE_ACT, 0x0871); -packet(CMSG_PLAYER_RESTART, 0x00b2); -packet(CMSG_PLAYER_EMOTE, 0x00bf); -packet(CMSG_PLAYER_STOP_ATTACK, 0x0118); -packet(CMSG_WHO_REQUEST, 0x00c1); - -packet(CMSG_NPC_TALK, 0x0090); -packet(CMSG_NPC_NEXT_REQUEST, 0x00b9); -packet(CMSG_NPC_CLOSE, 0x0146); -packet(CMSG_NPC_LIST_CHOICE, 0x00b8); -packet(CMSG_NPC_INT_RESPONSE, 0x0143); -packet(CMSG_NPC_STR_RESPONSE, 0x01d5); -packet(CMSG_NPC_BUY_SELL_REQUEST, 0x00c5); -packet(CMSG_NPC_BUY_REQUEST, 0x00c8); -packet(CMSG_NPC_SELL_REQUEST, 0x00c9); -packet(CMSG_NPC_MARKET_CLOSE, 0x09d8); -packet(CMSG_NPC_MARKET_BUY, 0x09d6); -packet(CMSG_NPC_CASH_SHOP_BUY, 0x0288); -packet(CMSG_NPC_CASH_SHOP_CLOSE, 0x084a); -packet(CMSG_NPC_CASH_SHOP_OPEN, 0x0844); -packet(CMSG_NPC_CASH_SHOP_REQUEST_TAB, 0x0846); -packet(CMSG_NPC_CASH_SHOP_SCHEDULE, 0x08c9); - -packet(CMSG_TRADE_REQUEST, 0x00e4); -packet(CMSG_TRADE_RESPONSE, 0x00e6); -packet(CMSG_TRADE_ITEM_ADD_REQUEST, 0x00e8); -packet(CMSG_TRADE_CANCEL_REQUEST, 0x00ed); -packet(CMSG_TRADE_ADD_COMPLETE, 0x00eb); -packet(CMSG_TRADE_OK, 0x00ef); - -packet(CMSG_PARTY_CREATE, 0x00f9); -packet(CMSG_PARTY_CREATE2, 0x01e8); -packet(CMSG_PARTY_INVITE, 0x00fc); -packet(CMSG_PARTY_INVITE2, 0x095d); -packet(CMSG_PARTY_INVITED, 0x00ff); -packet(CMSG_PARTY_INVITED2, 0x02c7); -packet(CMSG_PARTY_LEAVE, 0x0100); -packet(CMSG_PARTY_SETTINGS, 0x0102); -packet(CMSG_PARTY_KICK, 0x0103); -packet(CMSG_PARTY_MESSAGE, 0x0108); -packet(CMSG_PARTY_CHANGE_LEADER, 0x07da); -packet(CMSG_PARTY_ALLOW_INVITES, 0x02c8); - -packet(CMSG_MOVE_TO_STORAGE, 0x07ec); /** Move item to storage */ -packet(CMSG_MOVE_FROM_STORAGE, 0x085b); /** Remove item from storage */ -packet(CMSG_CLOSE_STORAGE, 0x0193); /** Request storage close */ - -packet(CMSG_MOVE_TO_CART, 0x0126); -packet(CMSG_MOVE_FROM_CART, 0x0127); -packet(CMSG_CHANGE_CART, 0x01af); -packet(CMSG_MOVE_FROM_STORAGE_TO_CART, 0x0128); -packet(CMSG_MOVE_FROM_CART_TO_STORAGE, 0x0129); - -packet(CMSG_ADMIN_ANNOUNCE, 0x0099); -packet(CMSG_ADMIN_LOCAL_ANNOUNCE, 0x019C); -packet(CMSG_ADMIN_HIDE, 0x019D); -packet(CMSG_ADMIN_KICK, 0x00CC); -packet(CMSG_ADMIN_KICK_ALL, 0x00ce); -packet(CMSG_ADMIN_RESET_PLAYER, 0x0197); -packet(CMSG_ADMIN_GOTO, 0x01bb); -packet(CMSG_ADMIN_RECALL, 0x01bd); -packet(CMSG_ADMIN_MUTE, 0x0149); -packet(CMSG_ADMIN_MUTE_NAME, 0x0212); -packet(CMSG_ADMIN_ID_TO_LOGIN, 0x01df); -packet(CMSG_ADMIN_SET_TILE_TYPE, 0x0198); -packet(CMSG_ADMIN_UNEQUIP_ALL, 0x07f5); -packet(CMSG_ADMIN_REQUEST_STATS, 0x0213); - -packet(CMSG_GUILD_CHECK_MASTER, 0x014d); -packet(CMSG_GUILD_REQUEST_INFO, 0x014f); -packet(CMSG_GUILD_REQUEST_EMBLEM, 0x0151); -packet(CMSG_GUILD_CHANGE_EMBLEM, 0x0153); -packet(CMSG_GUILD_CHANGE_MEMBER_POS, 0x0155); -packet(CMSG_GUILD_LEAVE, 0x0159); -packet(CMSG_GUILD_EXPULSION, 0x015b); -packet(CMSG_GUILD_BREAK, 0x015d); -packet(CMSG_GUILD_CHANGE_POS_INFO, 0x0161); -packet(CMSG_GUILD_CREATE, 0x0165); -packet(CMSG_GUILD_INVITE, 0x0168); -packet(CMSG_GUILD_INVITE_REPLY, 0x016b); -packet(CMSG_GUILD_CHANGE_NOTICE, 0x016e); -packet(CMSG_GUILD_ALLIANCE_REQUEST, 0x0170); -packet(CMSG_GUILD_ALLIANCE_REPLY, 0x0172); -packet(CMSG_GUILD_MESSAGE, 0x017e); -packet(CMSG_GUILD_OPPOSITION, 0x0180); -packet(CMSG_GUILD_ALLIANCE_DELETE, 0x0183); - -packet(CMSG_SOLVE_CHAR_NAME, 0x0368); -packet(CMSG_IGNORE_ALL, 0x00d0); -packet(CMSG_IGNORE_NICK, 0x00cf); -packet(CMSG_REQUEST_IGNORE_LIST, 0x00d3); -packet(CMSG_REQUEST_RANKS, 0x097c); -packet(CMSG_SET_SHORTCUTS, 0x02ba); -packet(CMSG_NPC_COMPLETE_PROGRESS_BAR, 0x02f1); -packet(CMSG_NPC_PRODUCE_MIX, 0x018e); -packet(CMSG_NPC_COOKING, 0x025b); -packet(CMSG_NPC_REPAIR, 0x01fd); -packet(CMSG_NPC_REFINE, 0x0222); -packet(CMSG_NPC_IDENTIFY, 0x0178); -packet(CMSG_NPC_SELECT_ARROW, 0x01ae); -packet(CMSG_NPC_SELECT_AUTO_SPELL, 0x01ce); -packet(CMSG_NPC_SHOP_CLOSE, 0x09d4); - -packet(CMSG_PLAYER_MAPMOVE, 0x0140); -packet(CMSG_REMOVE_OPTION, 0x012a); -packet(CMSG_PLAYER_SET_MEMO, 0x011d); - -packet(CMSG_PET_CATCH, 0x019f); -packet(CMSG_PET_SEND_MESSAGE, 0x01a9); -packet(CMSG_PET_SET_NAME, 0x01a5); -packet(CMSG_PET_SELECT_EGG, 0x01a7); -packet(CMSG_PET_MENU_ACTION, 0x01a1); -packet(CMSG_PET_TALK, 0x0b0c); -packet(CMSG_PET_EMOTE, 0x0b0d); -packet(CMSG_PET_MOVE_TO, 0x0b11); -packet(CMSG_PET_DIRECTION, 0x0b12); - -packet(CMSG_MERCENARY_ACTION, 0x029f); -packet(CMSG_HOMUNCULUS_SET_NAME, 0x0231); -packet(CMSG_HOMUNCULUS_MENU, 0x0361); -packet(CMSG_HOMMERC_MOVE_TO_MASTER, 0x0234); -packet(CMSG_HOMMERC_MOVE_TO, 0x0232); -packet(CMSG_HOMMERC_ATTACK, 0x0233); -packet(CMSG_HOMMERC_TALK, 0x0b13); -packet(CMSG_HOMMERC_EMOTE, 0x0b14); -packet(CMSG_HOMMERC_DIRECTION, 0x0b15); - -packet(CMSG_DORI_DORI, 0x01e7); -packet(CMSG_EXPLOSION_SPIRITS, 0x01ed); packet(SMSG_SPIRIT_BALLS, 0x01d0); packet(SMSG_SPIRIT_BALL_SINGLE, 0x01e1); packet(SMSG_BLADE_STOP, 0x01d1); packet(SMSG_COMBO_DELAY, 0x01d2); packet(SMSG_WEDDING_EFFECT, 0x01ea); -packet(CMSG_PVP_INFO, 0x020f); -packet(CMSG_PLAYER_AUTO_REVIVE, 0x0292); -packet(CMSG_QUEST_ACTIVATE, 0x02b6); - -packet(CMSG_MAIL_REFRESH_INBOX, 0x023f); -packet(CMSG_MAIL_READ_MESSAGE, 0x0241); -packet(CMSG_MAIL_GET_ATTACH, 0x0244); -packet(CMSG_MAIL_DELETE_MESSAGE, 0x0243); -packet(CMSG_MAIL_RETURN_MESSAGE, 0x0273); -packet(CMSG_MAIL_SET_ATTACH, 0x0247); -packet(CMSG_MAIL_RESET_ATTACH, 0x0246); -packet(CMSG_MAIL_SEND, 0x0248); - -packet(CMSG_FAMILY_ASK_FOR_CHILD, 0x01f9); -packet(CMSG_FAMILY_ASK_FOR_CHILD_REPLY, 0x01f7); - -packet(CMSG_BANK_DEPOSIT, 0x09a7); -packet(CMSG_BANK_WITHDRAW, 0x09a9); -packet(CMSG_BANK_CHECK, 0x09ab); -packet(CMSG_BANK_OPEN, 0x09b6); -packet(CMSG_BANK_CLOSE, 0x09b8); - -packet(CMSG_FRIENDS_ADD_PLAYER, 0x091a); -packet(CMSG_FRIENDS_REQUEST_ACK, 0x0208); -packet(CMSG_FRIENDS_DELETE_PLAYER, 0x0203); - -packet(CMSG_AUCTION_CANCEL_REG, 0x024b); -packet(CMSG_AUCTION_SET_ITEM, 0x024c); -packet(CMSG_AUCTION_REGISTER, 0x024d); -packet(CMSG_AUCTION_CANCEL, 0x024e); -packet(CMSG_AUCTION_CLOSE, 0x025d); -packet(CMSG_AUCTION_BID, 0x024f); -packet(CMSG_AUCTION_SEARCH, 0x0251); -packet(CMSG_AUCTION_BUY_SELL, 0x025c); - -packet(CMSG_VENDING_CLOSE, 0x012e); -packet(CMSG_VENDING_LIST_REQ, 0x0130); -packet(CMSG_VENDING_BUY, 0x0134); -packet(CMSG_VENDING_BUY2, 0x0801); -packet(CMSG_VENDING_CREATE_SHOP, 0x01b2); - -packet(CMSG_BUYINGSTORE_CREATE, 0x0815); -packet(CMSG_BUYINGSTORE_CLOSE, 0x0817); -packet(CMSG_BUYINGSTORE_OPEN, 0x0360); -packet(CMSG_BUYINGSTORE_SELL, 0x0811); - -packet(CMSG_SEARCHSTORE_SEARCH, 0x0819); -packet(CMSG_SEARCHSTORE_NEXT_PAGE, 0x0940); -packet(CMSG_SEARCHSTORE_CLOSE, 0x083b); -packet(CMSG_SEARCHSTORE_CLICK, 0x0835); - -packet(CMSG_SET_STATUS, 0x0b0e); - -packet(CMSG_ONLINE_LIST, 0x0b0f); - -#undef packet diff --git a/src/net/eathena/packetsout.inc b/src/net/eathena/packetsout.inc new file mode 100644 index 000000000..709595402 --- /dev/null +++ b/src/net/eathena/packetsout.inc @@ -0,0 +1,268 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +packet(CMSG_SERVER_VERSION_REQUEST, 0x7530); + +packet(CMSG_LOGIN_REGISTER, 0x0064); +packet(CMSG_LOGIN_REGISTER2, 0x027c); +packet(CMSG_NAME_REQUEST, 0x088a); + +packet(CMSG_CHAR_PASSWORD_CHANGE, 0x0061); +packet(CMSG_CHAR_SERVER_CONNECT, 0x0065); +packet(CMSG_CHAR_SELECT, 0x0066); +packet(CMSG_CHAR_CREATE, 0x0970); +packet(CMSG_CHAR_DELETE, 0x0068); +packet(CMSG_CHAR_CREATE_PIN, 0x08ba); +packet(CMSG_CHAR_CHECK_RENAME, 0x08fc); +packet(CMSG_CHAR_RENAME, 0x028f); +packet(CMSG_CHAR_CHANGE_SLOT, 0x08d4); + +packet(CMSG_MAP_SERVER_CONNECT, 0x089c); +packet(CMSG_MAP_PING, 0x035f); /**< Send to server with tick */ +packet(CMSG_LOGIN_PING, 0x0200); +packet(CMSG_CHAR_PING, 0x0187); +packet(CMSG_MAP_LOADED, 0x007d); +packet(CMSG_CLIENT_QUIT, 0x018A); + +packet(CMSG_CHAT_MESSAGE, 0x00f3); +packet(CMSG_CHAT_WHISPER, 0x0096); +packet(CMSG_CHAT_WHO, 0x00c1); +packet(CMSG_CHAT_ROOM_JOIN, 0x00d9); +packet(CMSG_CHAT_JOIN_CHANNEL, 0x0b07); +packet(CMSG_CHAT_PART_CHANNEL, 0x0b09); +packet(CMSG_BATTLE_CHAT_MESSAGE, 0x02db); + +packet(CMSG_BATTLE_REGISTER, 0x08d7); +packet(CMSG_BATTLE_REVOKE, 0x08da); +packet(CMSG_BATTLE_BEGIN_ACK, 0x08e0); +packet(CMSG_BATTLE_CHECK_STATE, 0x090a); + +packet(CMSG_CREAYE_CHAT_ROOM, 0x00d5); +packet(CMSG_LEAVE_CHAT_ROOM, 0x00e3); +packet(CMSG_SET_CHAT_ROOM_OPTIONS, 0x00de); +packet(CMSG_SET_CHAT_ROOM_OWNER, 0x00e0); +packet(CMSG_KICK_FROM_CHAT_ROOM, 0x00e2); + +packet(CMSG_SKILL_LEVELUP_REQUEST, 0x0112); +packet(CMSG_STAT_UPDATE_REQUEST, 0x00bb); +packet(CMSG_SKILL_USE_BEING, 0x083c); +packet(CMSG_SKILL_USE_POSITION, 0x0436); +// Variant of 0x116 with 80 char string at end (unsure of use) +packet(CMSG_SKILL_USE_POSITION_MORE, 0x0366); +packet(CMSG_SKILL_USE_MAP, 0x011b); + +packet(CMSG_PLAYER_INVENTORY_USE, 0x0439); +packet(CMSG_PLAYER_INVENTORY_DROP, 0x0362); +packet(CMSG_PLAYER_EQUIP, 0x0998); +packet(CMSG_PLAYER_UNEQUIP, 0x00ab); +packet(CMSG_PLAYER_USE_CARD, 0x017a); +packet(CMSG_PLAYER_INSERT_CARD, 0x017c); +packet(CMSG_PLAYER_VIEW_EQUIPMENT, 0x02d6); +packet(CMSG_PLAYER_SET_EQUIPMENT_VISIBLE, 0x02d8); +packet(CMSG_PLAYER_FAVORITE_ITEM, 0x0907); + +packet(CMSG_ITEM_PICKUP, 0x07e4); +packet(CMSG_PLAYER_CHANGE_DIR, 0x0202); +packet(CMSG_PLAYER_CHANGE_DEST, 0x0437); +packet(CMSG_PLAYER_CHANGE_ACT, 0x0871); +packet(CMSG_PLAYER_RESTART, 0x00b2); +packet(CMSG_PLAYER_EMOTE, 0x00bf); +packet(CMSG_PLAYER_STOP_ATTACK, 0x0118); +packet(CMSG_WHO_REQUEST, 0x00c1); + +packet(CMSG_NPC_TALK, 0x0090); +packet(CMSG_NPC_NEXT_REQUEST, 0x00b9); +packet(CMSG_NPC_CLOSE, 0x0146); +packet(CMSG_NPC_LIST_CHOICE, 0x00b8); +packet(CMSG_NPC_INT_RESPONSE, 0x0143); +packet(CMSG_NPC_STR_RESPONSE, 0x01d5); +packet(CMSG_NPC_BUY_SELL_REQUEST, 0x00c5); +packet(CMSG_NPC_BUY_REQUEST, 0x00c8); +packet(CMSG_NPC_SELL_REQUEST, 0x00c9); +packet(CMSG_NPC_MARKET_CLOSE, 0x09d8); +packet(CMSG_NPC_MARKET_BUY, 0x09d6); +packet(CMSG_NPC_CASH_SHOP_BUY, 0x0288); +packet(CMSG_NPC_CASH_SHOP_CLOSE, 0x084a); +packet(CMSG_NPC_CASH_SHOP_OPEN, 0x0844); +packet(CMSG_NPC_CASH_SHOP_REQUEST_TAB, 0x0846); +packet(CMSG_NPC_CASH_SHOP_SCHEDULE, 0x08c9); + +packet(CMSG_TRADE_REQUEST, 0x00e4); +packet(CMSG_TRADE_RESPONSE, 0x00e6); +packet(CMSG_TRADE_ITEM_ADD_REQUEST, 0x00e8); +packet(CMSG_TRADE_CANCEL_REQUEST, 0x00ed); +packet(CMSG_TRADE_ADD_COMPLETE, 0x00eb); +packet(CMSG_TRADE_OK, 0x00ef); + +packet(CMSG_PARTY_CREATE, 0x00f9); +packet(CMSG_PARTY_CREATE2, 0x01e8); +packet(CMSG_PARTY_INVITE, 0x00fc); +packet(CMSG_PARTY_INVITE2, 0x095d); +packet(CMSG_PARTY_INVITED, 0x00ff); +packet(CMSG_PARTY_INVITED2, 0x02c7); +packet(CMSG_PARTY_LEAVE, 0x0100); +packet(CMSG_PARTY_SETTINGS, 0x0102); +packet(CMSG_PARTY_KICK, 0x0103); +packet(CMSG_PARTY_MESSAGE, 0x0108); +packet(CMSG_PARTY_CHANGE_LEADER, 0x07da); +packet(CMSG_PARTY_ALLOW_INVITES, 0x02c8); + +packet(CMSG_MOVE_TO_STORAGE, 0x07ec); /** Move item to storage */ +packet(CMSG_MOVE_FROM_STORAGE, 0x085b); /** Remove item from storage */ +packet(CMSG_CLOSE_STORAGE, 0x0193); /** Request storage close */ + +packet(CMSG_MOVE_TO_CART, 0x0126); +packet(CMSG_MOVE_FROM_CART, 0x0127); +packet(CMSG_CHANGE_CART, 0x01af); +packet(CMSG_MOVE_FROM_STORAGE_TO_CART, 0x0128); +packet(CMSG_MOVE_FROM_CART_TO_STORAGE, 0x0129); + +packet(CMSG_ADMIN_ANNOUNCE, 0x0099); +packet(CMSG_ADMIN_LOCAL_ANNOUNCE, 0x019C); +packet(CMSG_ADMIN_HIDE, 0x019D); +packet(CMSG_ADMIN_KICK, 0x00CC); +packet(CMSG_ADMIN_KICK_ALL, 0x00ce); +packet(CMSG_ADMIN_RESET_PLAYER, 0x0197); +packet(CMSG_ADMIN_GOTO, 0x01bb); +packet(CMSG_ADMIN_RECALL, 0x01bd); +packet(CMSG_ADMIN_MUTE, 0x0149); +packet(CMSG_ADMIN_MUTE_NAME, 0x0212); +packet(CMSG_ADMIN_ID_TO_LOGIN, 0x01df); +packet(CMSG_ADMIN_SET_TILE_TYPE, 0x0198); +packet(CMSG_ADMIN_UNEQUIP_ALL, 0x07f5); +packet(CMSG_ADMIN_REQUEST_STATS, 0x0213); + +packet(CMSG_GUILD_CHECK_MASTER, 0x014d); +packet(CMSG_GUILD_REQUEST_INFO, 0x014f); +packet(CMSG_GUILD_REQUEST_EMBLEM, 0x0151); +packet(CMSG_GUILD_CHANGE_EMBLEM, 0x0153); +packet(CMSG_GUILD_CHANGE_MEMBER_POS, 0x0155); +packet(CMSG_GUILD_LEAVE, 0x0159); +packet(CMSG_GUILD_EXPULSION, 0x015b); +packet(CMSG_GUILD_BREAK, 0x015d); +packet(CMSG_GUILD_CHANGE_POS_INFO, 0x0161); +packet(CMSG_GUILD_CREATE, 0x0165); +packet(CMSG_GUILD_INVITE, 0x0168); +packet(CMSG_GUILD_INVITE_REPLY, 0x016b); +packet(CMSG_GUILD_CHANGE_NOTICE, 0x016e); +packet(CMSG_GUILD_ALLIANCE_REQUEST, 0x0170); +packet(CMSG_GUILD_ALLIANCE_REPLY, 0x0172); +packet(CMSG_GUILD_MESSAGE, 0x017e); +packet(CMSG_GUILD_OPPOSITION, 0x0180); +packet(CMSG_GUILD_ALLIANCE_DELETE, 0x0183); + +packet(CMSG_SOLVE_CHAR_NAME, 0x0368); +packet(CMSG_IGNORE_ALL, 0x00d0); +packet(CMSG_IGNORE_NICK, 0x00cf); +packet(CMSG_REQUEST_IGNORE_LIST, 0x00d3); +packet(CMSG_REQUEST_RANKS, 0x097c); +packet(CMSG_SET_SHORTCUTS, 0x02ba); +packet(CMSG_NPC_COMPLETE_PROGRESS_BAR, 0x02f1); +packet(CMSG_NPC_PRODUCE_MIX, 0x018e); +packet(CMSG_NPC_COOKING, 0x025b); +packet(CMSG_NPC_REPAIR, 0x01fd); +packet(CMSG_NPC_REFINE, 0x0222); +packet(CMSG_NPC_IDENTIFY, 0x0178); +packet(CMSG_NPC_SELECT_ARROW, 0x01ae); +packet(CMSG_NPC_SELECT_AUTO_SPELL, 0x01ce); +packet(CMSG_NPC_SHOP_CLOSE, 0x09d4); + +packet(CMSG_PLAYER_MAPMOVE, 0x0140); +packet(CMSG_REMOVE_OPTION, 0x012a); +packet(CMSG_PLAYER_SET_MEMO, 0x011d); + +packet(CMSG_PET_CATCH, 0x019f); +packet(CMSG_PET_SEND_MESSAGE, 0x01a9); +packet(CMSG_PET_SET_NAME, 0x01a5); +packet(CMSG_PET_SELECT_EGG, 0x01a7); +packet(CMSG_PET_MENU_ACTION, 0x01a1); +packet(CMSG_PET_TALK, 0x0b0c); +packet(CMSG_PET_EMOTE, 0x0b0d); +packet(CMSG_PET_MOVE_TO, 0x0b11); +packet(CMSG_PET_DIRECTION, 0x0b12); + +packet(CMSG_MERCENARY_ACTION, 0x029f); +packet(CMSG_HOMUNCULUS_SET_NAME, 0x0231); +packet(CMSG_HOMUNCULUS_MENU, 0x0361); +packet(CMSG_HOMMERC_MOVE_TO_MASTER, 0x0234); +packet(CMSG_HOMMERC_MOVE_TO, 0x0232); +packet(CMSG_HOMMERC_ATTACK, 0x0233); +packet(CMSG_HOMMERC_TALK, 0x0b13); +packet(CMSG_HOMMERC_EMOTE, 0x0b14); +packet(CMSG_HOMMERC_DIRECTION, 0x0b15); + +packet(CMSG_DORI_DORI, 0x01e7); +packet(CMSG_EXPLOSION_SPIRITS, 0x01ed); +packet(CMSG_PVP_INFO, 0x020f); +packet(CMSG_PLAYER_AUTO_REVIVE, 0x0292); +packet(CMSG_QUEST_ACTIVATE, 0x02b6); + +packet(CMSG_MAIL_REFRESH_INBOX, 0x023f); +packet(CMSG_MAIL_READ_MESSAGE, 0x0241); +packet(CMSG_MAIL_GET_ATTACH, 0x0244); +packet(CMSG_MAIL_DELETE_MESSAGE, 0x0243); +packet(CMSG_MAIL_RETURN_MESSAGE, 0x0273); +packet(CMSG_MAIL_SET_ATTACH, 0x0247); +packet(CMSG_MAIL_RESET_ATTACH, 0x0246); +packet(CMSG_MAIL_SEND, 0x0248); + +packet(CMSG_FAMILY_ASK_FOR_CHILD, 0x01f9); +packet(CMSG_FAMILY_ASK_FOR_CHILD_REPLY, 0x01f7); + +packet(CMSG_BANK_DEPOSIT, 0x09a7); +packet(CMSG_BANK_WITHDRAW, 0x09a9); +packet(CMSG_BANK_CHECK, 0x09ab); +packet(CMSG_BANK_OPEN, 0x09b6); +packet(CMSG_BANK_CLOSE, 0x09b8); + +packet(CMSG_FRIENDS_ADD_PLAYER, 0x091a); +packet(CMSG_FRIENDS_REQUEST_ACK, 0x0208); +packet(CMSG_FRIENDS_DELETE_PLAYER, 0x0203); + +packet(CMSG_AUCTION_CANCEL_REG, 0x024b); +packet(CMSG_AUCTION_SET_ITEM, 0x024c); +packet(CMSG_AUCTION_REGISTER, 0x024d); +packet(CMSG_AUCTION_CANCEL, 0x024e); +packet(CMSG_AUCTION_CLOSE, 0x025d); +packet(CMSG_AUCTION_BID, 0x024f); +packet(CMSG_AUCTION_SEARCH, 0x0251); +packet(CMSG_AUCTION_BUY_SELL, 0x025c); + +packet(CMSG_VENDING_CLOSE, 0x012e); +packet(CMSG_VENDING_LIST_REQ, 0x0130); +packet(CMSG_VENDING_BUY, 0x0134); +packet(CMSG_VENDING_BUY2, 0x0801); +packet(CMSG_VENDING_CREATE_SHOP, 0x01b2); + +packet(CMSG_BUYINGSTORE_CREATE, 0x0815); +packet(CMSG_BUYINGSTORE_CLOSE, 0x0817); +packet(CMSG_BUYINGSTORE_OPEN, 0x0360); +packet(CMSG_BUYINGSTORE_SELL, 0x0811); + +packet(CMSG_SEARCHSTORE_SEARCH, 0x0819); +packet(CMSG_SEARCHSTORE_NEXT_PAGE, 0x0940); +packet(CMSG_SEARCHSTORE_CLOSE, 0x083b); +packet(CMSG_SEARCHSTORE_CLICK, 0x0835); + +packet(CMSG_SET_STATUS, 0x0b0e); + +packet(CMSG_ONLINE_LIST, 0x0b0f); diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h index b1e59d443..3ed59bb86 100644 --- a/src/net/eathena/protocol.h +++ b/src/net/eathena/protocol.h @@ -25,6 +25,9 @@ #include "net/protocoldefine.h" -#include "net/eathena/packets.inc" +#include "net/eathena/packetsin.inc" +#include "net/eathena/packetsout.inc" + +#undef packet #endif // NET_EATHENA_PROTOCOL_H diff --git a/src/net/eathena/recvpackets.inc b/src/net/eathena/recvpackets.inc index e14b1252b..e2fddf314 100644 --- a/src/net/eathena/recvpackets.inc +++ b/src/net/eathena/recvpackets.inc @@ -23,6 +23,8 @@ #include "net/recvpacketdefine.h" -#include "net/eathena/packets.inc" +#include "net/eathena/packetsin.inc" + +#undef packet #endif // NET_EATHENA_RECVPACKETS_H diff --git a/src/net/tmwa/packets.inc b/src/net/tmwa/packetsin.inc index 3933b8379..af219d4a5 100644 --- a/src/net/tmwa/packets.inc +++ b/src/net/tmwa/packetsin.inc @@ -22,8 +22,6 @@ packet(SMSG_SERVER_VERSION_RESPONSE, 0x7531); -packet(CMSG_LOGIN_REGISTER, 0x0064); - packet(SMSG_SERVER_PING, 0x007f); /**< Contains server tick */ packet(SMSG_CONNECTION_PROBLEM, 0x0081); @@ -91,7 +89,6 @@ packet(SMSG_BEING_SELFEFFECT, 0x019b); packet(SMSG_BEING_EMOTION, 0x00c0); packet(SMSG_BEING_ACTION, 0x008a); /**< Attack, sit, stand up, ... */ packet(SMSG_BEING_CHAT, 0x008d); /**< A being talks */ -packet(CMSG_NAME_REQUEST, 0x0094); packet(SMSG_BEING_NAME_RESPONSE, 0x0095); /**< Has to be requested */ packet(SMSG_BEING_CHANGE_DIRECTION, 0x009c); packet(SMSG_BEING_RESURRECT, 0x0148); @@ -176,108 +173,7 @@ packet(SMSG_GUILD_BROKEN, 0x015e); packet(SMSG_MVP_EFFECT, 0x010c); -/********************************** - * Packets from client to server * - **********************************/ -packet(CMSG_SERVER_VERSION_REQUEST, 0x7530); - -// Custom change password packet -packet(CMSG_CHAR_PASSWORD_CHANGE, 0x0061); -packet(CMSG_CHAR_SERVER_CONNECT, 0x0065); -packet(CMSG_CHAR_SELECT, 0x0066); -packet(CMSG_CHAR_CREATE, 0x0067); -packet(CMSG_CHAR_DELETE, 0x0068); - -packet(CMSG_MAP_SERVER_CONNECT, 0x0072); -packet(CMSG_MAP_PING, 0x007e); /**< Send to server with tick */ -packet(CMSG_MAP_LOADED, 0x007d); -packet(CMSG_CLIENT_QUIT, 0x018A); - -packet(CMSG_CHAT_MESSAGE, 0x008c); -packet(CMSG_CHAT_WHISPER, 0x0096); -packet(CMSG_CHAT_WHO, 0x00c1); - -packet(CMSG_SKILL_LEVELUP_REQUEST, 0x0112); -packet(CMSG_STAT_UPDATE_REQUEST, 0x00bb); -packet(CMSG_SKILL_USE_BEING, 0x0113); -packet(CMSG_SKILL_USE_POSITION, 0x0116); -// Variant of 0x116 with 80 char string at end (unsure of use) -packet(CMSG_SKILL_USE_POSITION_MORE, 0x0190); -packet(CMSG_SKILL_USE_MAP, 0x011b); - -packet(CMSG_PLAYER_INVENTORY_USE, 0x00a7); -packet(CMSG_PLAYER_INVENTORY_DROP, 0x00a2); -packet(CMSG_PLAYER_EQUIP, 0x00a9); -packet(CMSG_PLAYER_UNEQUIP, 0x00ab); - -packet(CMSG_ITEM_PICKUP, 0x009f); -packet(CMSG_PLAYER_CHANGE_DIR, 0x009b); -packet(CMSG_PLAYER_CHANGE_DEST, 0x0085); -packet(CMSG_PLAYER_CHANGE_ACT, 0x0089); -packet(CMSG_PLAYER_RESTART, 0x00b2); -packet(CMSG_PLAYER_EMOTE, 0x00bf); -packet(CMSG_PLAYER_STOP_ATTACK, 0x0118); -packet(CMSG_WHO_REQUEST, 0x00c1); - -packet(CMSG_NPC_TALK, 0x0090); -packet(CMSG_NPC_NEXT_REQUEST, 0x00b9); -packet(CMSG_NPC_CLOSE, 0x0146); -packet(CMSG_NPC_LIST_CHOICE, 0x00b8); -packet(CMSG_NPC_INT_RESPONSE, 0x0143); -packet(CMSG_NPC_STR_RESPONSE, 0x01d5); -packet(CMSG_NPC_BUY_SELL_REQUEST, 0x00c5); -packet(CMSG_NPC_BUY_REQUEST, 0x00c8); -packet(CMSG_NPC_SELL_REQUEST, 0x00c9); - -packet(CMSG_TRADE_REQUEST, 0x00e4); -packet(CMSG_TRADE_RESPONSE, 0x00e6); -packet(CMSG_TRADE_ITEM_ADD_REQUEST, 0x00e8); -packet(CMSG_TRADE_CANCEL_REQUEST, 0x00ed); -packet(CMSG_TRADE_ADD_COMPLETE, 0x00eb); -packet(CMSG_TRADE_OK, 0x00ef); - -packet(CMSG_PARTY_CREATE, 0x00f9); -packet(CMSG_PARTY_INVITE, 0x00fc); -packet(CMSG_PARTY_INVITED, 0x00ff); -packet(CMSG_PARTY_LEAVE, 0x0100); -packet(CMSG_PARTY_SETTINGS, 0x0102); -packet(CMSG_PARTY_KICK, 0x0103); -packet(CMSG_PARTY_MESSAGE, 0x0108); - -packet(CMSG_MOVE_TO_STORAGE, 0x00f3); /** Move item to storage */ -packet(CMSG_MOVE_FROM_STORAGE, 0x00f5); /** Remove item from storage */ -packet(CMSG_CLOSE_STORAGE, 0x00f7); /** Request storage close */ - -packet(CMSG_ADMIN_ANNOUNCE, 0x0099); -packet(CMSG_ADMIN_LOCAL_ANNOUNCE, 0x019C); -packet(CMSG_ADMIN_HIDE, 0x019D); -packet(CMSG_ADMIN_KICK, 0x00CC); -packet(CMSG_ADMIN_MUTE, 0x0149); - -packet(CMSG_GUILD_CHECK_MASTER, 0x014d); -packet(CMSG_GUILD_REQUEST_INFO, 0x014f); -packet(CMSG_GUILD_REQUEST_EMBLEM, 0x0151); -packet(CMSG_GUILD_CHANGE_EMBLEM, 0x0153); -packet(CMSG_GUILD_CHANGE_MEMBER_POS, 0x0155); -packet(CMSG_GUILD_LEAVE, 0x0159); -packet(CMSG_GUILD_EXPULSION, 0x015b); -packet(CMSG_GUILD_BREAK, 0x015d); -packet(CMSG_GUILD_CHANGE_POS_INFO, 0x0161); -packet(CMSG_GUILD_CREATE, 0x0165); -packet(CMSG_GUILD_INVITE, 0x0168); -packet(CMSG_GUILD_INVITE_REPLY, 0x016b); -packet(CMSG_GUILD_CHANGE_NOTICE, 0x016e); -packet(CMSG_GUILD_ALLIANCE_REQUEST, 0x0170); -packet(CMSG_GUILD_ALLIANCE_REPLY, 0x0172); -packet(CMSG_GUILD_MESSAGE, 0x017e); -packet(CMSG_GUILD_OPPOSITION, 0x0180); -packet(CMSG_GUILD_ALLIANCE_DELETE, 0x0183); - -packet(CMSG_SOLVE_CHAR_NAME, 0x0193); -packet(CMSG_IGNORE_NICK, 0x00cf); packet(SMSG_SOLVE_CHAR_NAME, 0x0194); - -packet(CMSG_CLIENT_DISCONNECT, 0x7532); packet(SMSG_SKILL_CASTING, 0x013e); packet(SMSG_SKILL_CAST_CANCEL, 0x01b9); packet(SMSG_SKILL_NO_DAMAGE, 0x011a); @@ -285,7 +181,7 @@ packet(SMSG_SKILL_NO_DAMAGE, 0x011a); packet(SMSG_BEING_IP_RESPONSE, 0x020c); packet(SMSG_PVP_MAP_MODE, 0x0199); packet(SMSG_PVP_SET, 0x019a); -packet(CMSG_IGNORE_ALL, 0x00d0); + packet(SMSG_IGNORE_ALL_RESPONSE, 0x00d2); packet(SMSG_NPC_COMMAND, 0x0212); packet(SMSG_QUEST_SET_VAR, 0x0214); @@ -294,5 +190,3 @@ packet(SMSG_BEING_MOVE3, 0x0225); packet(SMSG_MAP_MUSIC, 0x0227); packet(SMSG_NPC_CHANGETITLE, 0x0228); packet(SMSG_SCRIPT_MESSAGE, 0x0229); - -#undef packet diff --git a/src/net/tmwa/packetsout.inc b/src/net/tmwa/packetsout.inc new file mode 100644 index 000000000..011af496a --- /dev/null +++ b/src/net/tmwa/packetsout.inc @@ -0,0 +1,125 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +packet(CMSG_SERVER_VERSION_REQUEST, 0x7530); + +packet(CMSG_LOGIN_REGISTER, 0x0064); + +packet(CMSG_NAME_REQUEST, 0x0094); + +// Custom change password packet +packet(CMSG_CHAR_PASSWORD_CHANGE, 0x0061); +packet(CMSG_CHAR_SERVER_CONNECT, 0x0065); +packet(CMSG_CHAR_SELECT, 0x0066); +packet(CMSG_CHAR_CREATE, 0x0067); +packet(CMSG_CHAR_DELETE, 0x0068); + +packet(CMSG_MAP_SERVER_CONNECT, 0x0072); +packet(CMSG_MAP_PING, 0x007e); /**< Send to server with tick */ +packet(CMSG_MAP_LOADED, 0x007d); +packet(CMSG_CLIENT_QUIT, 0x018A); + +packet(CMSG_CHAT_MESSAGE, 0x008c); +packet(CMSG_CHAT_WHISPER, 0x0096); +packet(CMSG_CHAT_WHO, 0x00c1); + +packet(CMSG_SKILL_LEVELUP_REQUEST, 0x0112); +packet(CMSG_STAT_UPDATE_REQUEST, 0x00bb); +packet(CMSG_SKILL_USE_BEING, 0x0113); +packet(CMSG_SKILL_USE_POSITION, 0x0116); +// Variant of 0x116 with 80 char string at end (unsure of use) +packet(CMSG_SKILL_USE_POSITION_MORE, 0x0190); +packet(CMSG_SKILL_USE_MAP, 0x011b); + +packet(CMSG_PLAYER_INVENTORY_USE, 0x00a7); +packet(CMSG_PLAYER_INVENTORY_DROP, 0x00a2); +packet(CMSG_PLAYER_EQUIP, 0x00a9); +packet(CMSG_PLAYER_UNEQUIP, 0x00ab); + +packet(CMSG_ITEM_PICKUP, 0x009f); +packet(CMSG_PLAYER_CHANGE_DIR, 0x009b); +packet(CMSG_PLAYER_CHANGE_DEST, 0x0085); +packet(CMSG_PLAYER_CHANGE_ACT, 0x0089); +packet(CMSG_PLAYER_RESTART, 0x00b2); +packet(CMSG_PLAYER_EMOTE, 0x00bf); +packet(CMSG_PLAYER_STOP_ATTACK, 0x0118); +packet(CMSG_WHO_REQUEST, 0x00c1); + +packet(CMSG_NPC_TALK, 0x0090); +packet(CMSG_NPC_NEXT_REQUEST, 0x00b9); +packet(CMSG_NPC_CLOSE, 0x0146); +packet(CMSG_NPC_LIST_CHOICE, 0x00b8); +packet(CMSG_NPC_INT_RESPONSE, 0x0143); +packet(CMSG_NPC_STR_RESPONSE, 0x01d5); +packet(CMSG_NPC_BUY_SELL_REQUEST, 0x00c5); +packet(CMSG_NPC_BUY_REQUEST, 0x00c8); +packet(CMSG_NPC_SELL_REQUEST, 0x00c9); + +packet(CMSG_TRADE_REQUEST, 0x00e4); +packet(CMSG_TRADE_RESPONSE, 0x00e6); +packet(CMSG_TRADE_ITEM_ADD_REQUEST, 0x00e8); +packet(CMSG_TRADE_CANCEL_REQUEST, 0x00ed); +packet(CMSG_TRADE_ADD_COMPLETE, 0x00eb); +packet(CMSG_TRADE_OK, 0x00ef); + +packet(CMSG_PARTY_CREATE, 0x00f9); +packet(CMSG_PARTY_INVITE, 0x00fc); +packet(CMSG_PARTY_INVITED, 0x00ff); +packet(CMSG_PARTY_LEAVE, 0x0100); +packet(CMSG_PARTY_SETTINGS, 0x0102); +packet(CMSG_PARTY_KICK, 0x0103); +packet(CMSG_PARTY_MESSAGE, 0x0108); + +packet(CMSG_MOVE_TO_STORAGE, 0x00f3); /** Move item to storage */ +packet(CMSG_MOVE_FROM_STORAGE, 0x00f5); /** Remove item from storage */ +packet(CMSG_CLOSE_STORAGE, 0x00f7); /** Request storage close */ + +packet(CMSG_ADMIN_ANNOUNCE, 0x0099); +packet(CMSG_ADMIN_LOCAL_ANNOUNCE, 0x019C); +packet(CMSG_ADMIN_HIDE, 0x019D); +packet(CMSG_ADMIN_KICK, 0x00CC); +packet(CMSG_ADMIN_MUTE, 0x0149); + +packet(CMSG_GUILD_CHECK_MASTER, 0x014d); +packet(CMSG_GUILD_REQUEST_INFO, 0x014f); +packet(CMSG_GUILD_REQUEST_EMBLEM, 0x0151); +packet(CMSG_GUILD_CHANGE_EMBLEM, 0x0153); +packet(CMSG_GUILD_CHANGE_MEMBER_POS, 0x0155); +packet(CMSG_GUILD_LEAVE, 0x0159); +packet(CMSG_GUILD_EXPULSION, 0x015b); +packet(CMSG_GUILD_BREAK, 0x015d); +packet(CMSG_GUILD_CHANGE_POS_INFO, 0x0161); +packet(CMSG_GUILD_CREATE, 0x0165); +packet(CMSG_GUILD_INVITE, 0x0168); +packet(CMSG_GUILD_INVITE_REPLY, 0x016b); +packet(CMSG_GUILD_CHANGE_NOTICE, 0x016e); +packet(CMSG_GUILD_ALLIANCE_REQUEST, 0x0170); +packet(CMSG_GUILD_ALLIANCE_REPLY, 0x0172); +packet(CMSG_GUILD_MESSAGE, 0x017e); +packet(CMSG_GUILD_OPPOSITION, 0x0180); +packet(CMSG_GUILD_ALLIANCE_DELETE, 0x0183); + +packet(CMSG_SOLVE_CHAR_NAME, 0x0193); +packet(CMSG_IGNORE_NICK, 0x00cf); + +packet(CMSG_CLIENT_DISCONNECT, 0x7532); +packet(CMSG_IGNORE_ALL, 0x00d0); diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h index 508507e0e..71e2a6981 100644 --- a/src/net/tmwa/protocol.h +++ b/src/net/tmwa/protocol.h @@ -25,6 +25,9 @@ #include "net/protocoldefine.h" -#include "net/tmwa/packets.inc" +#include "net/tmwa/packetsin.inc" +#include "net/tmwa/packetsout.inc" + +#undef packet #endif // NET_TMWA_PROTOCOL_H diff --git a/src/net/tmwa/recvpackets.inc b/src/net/tmwa/recvpackets.inc index 59c12fec2..13e76da4d 100644 --- a/src/net/tmwa/recvpackets.inc +++ b/src/net/tmwa/recvpackets.inc @@ -23,6 +23,8 @@ #include "net/recvpacketdefine.h" -#include "net/tmwa/packets.inc" +#include "net/tmwa/packetsin.inc" + +#undef packet #endif // NET_TMWA_RECVPACKETS_H |