Add packet sizes to packetin.inc. But for now size unused.

2 files changed, 152 insertions, 169 deletions

diff --git a/src/net/tmwa/packetsin.inc b/src/net/tmwa/packetsin.inc
index ee0830503..834d43e82 100644
--- a/src/net/tmwa/packetsin.inc
+++ b/src/net/tmwa/packetsin.inc
@@ -20,169 +20,151 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-packet(SMSG_SERVER_VERSION_RESPONSE, 0x7531);
-
-packet(SMSG_SERVER_PING,             0x007f);
-packet(SMSG_CONNECTION_PROBLEM,      0x0081);
-
-packet(SMSG_UPDATE_HOST,             0x0063);
-packet(SMSG_LOGIN_DATA,              0x0069);
-packet(SMSG_LOGIN_ERROR,             0x006a);
-
-packet(SMSG_CHAR_LOGIN,              0x006b);
-packet(SMSG_CHAR_LOGIN_ERROR,        0x006c);
-packet(SMSG_CHAR_CREATE_SUCCEEDED,   0x006d);
-
-packet(SMSG_CHAR_CREATE_FAILED,      0x006e);
-packet(SMSG_CHAR_DELETE_SUCCEEDED,   0x006f);
-packet(SMSG_CHAR_DELETE_FAILED,      0x0070);
-packet(SMSG_CHAR_MAP_INFO,           0x0071);
-
-packet(SMSG_CHAR_PASSWORD_RESPONSE,  0x0062);
-
-packet(SMSG_CHAR_SWITCH_RESPONSE,    0x00b3);
-packet(SMSG_CHANGE_MAP_SERVER,       0x0092);
-
-packet(SMSG_MAP_LOGIN_SUCCESS,       0x0073);
-packet(SMSG_MAP_QUIT_RESPONSE,       0x018b);
-packet(SMSG_PLAYER_UPDATE_1,         0x01d8);
-packet(SMSG_PLAYER_UPDATE_2,         0x01d9);
-packet(SMSG_PLAYER_MOVE,             0x01da);
-packet(SMSG_PLAYER_STOP,             0x0088);
-packet(SMSG_PLAYER_MOVE_TO_ATTACK,   0x0139);
-packet(SMSG_PLAYER_STAT_UPDATE_1,    0x00b0);
-packet(SMSG_PLAYER_STAT_UPDATE_2,    0x00b1);
-packet(SMSG_PLAYER_STAT_UPDATE_3,    0x0141);
-packet(SMSG_PLAYER_STAT_UPDATE_4,    0x00bc);
-packet(SMSG_PLAYER_STAT_UPDATE_5,    0x00bd);
-packet(SMSG_PLAYER_STAT_UPDATE_6,    0x00be);
-packet(SMSG_WHO_ANSWER,              0x00c2);
-packet(SMSG_PLAYER_WARP,             0x0091);
-packet(SMSG_PLAYER_INVENTORY,        0x01ee);
-packet(SMSG_PLAYER_INVENTORY_ADD,    0x00a0);
-packet(SMSG_PLAYER_INVENTORY_REMOVE, 0x00af);
-packet(SMSG_PLAYER_INVENTORY_USE,    0x01c8);
-packet(SMSG_PLAYER_EQUIPMENT,        0x00a4);
-packet(SMSG_PLAYER_EQUIP,            0x00aa);
-packet(SMSG_PLAYER_UNEQUIP,          0x00ac);
-packet(SMSG_PLAYER_ATTACK_RANGE,     0x013a);
-packet(SMSG_PLAYER_ARROW_EQUIP,      0x013c);
-packet(SMSG_PLAYER_ARROW_MESSAGE,    0x013b);
-packet(SMSG_PLAYER_SKILLS,           0x010f);
-packet(SMSG_PLAYER_SKILL_UP,         0x010e);
-packet(SMSG_SKILL_FAILED,            0x0110);
-packet(SMSG_SKILL_DAMAGE,            0x01de);
-packet(SMSG_ITEM_USE_RESPONSE,       0x00a8);
-packet(SMSG_ITEM_VISIBLE,            0x009d);
-packet(SMSG_ITEM_DROPPED,            0x009e);
-packet(SMSG_ITEM_REMOVE,             0x00a1);
-packet(SMSG_BEING_VISIBLE,           0x0078);
-packet(SMSG_BEING_MOVE,              0x007b);
-packet(SMSG_BEING_SPAWN,             0x007c);
-packet(SMSG_BEING_MOVE2,             0x0086);
-packet(SMSG_BEING_REMOVE,            0x0080);
-packet(SMSG_BEING_CHANGE_LOOKS,      0x00c3);
-packet(SMSG_BEING_CHANGE_LOOKS2,     0x01d7);
-packet(SMSG_BEING_SELFEFFECT,        0x019b);
-packet(SMSG_BEING_EMOTION,           0x00c0);
-packet(SMSG_BEING_ACTION,            0x008a);
-packet(SMSG_BEING_CHAT,              0x008d);
-packet(SMSG_BEING_NAME_RESPONSE,     0x0095);
-packet(SMSG_BEING_CHANGE_DIRECTION,  0x009c);
-packet(SMSG_BEING_RESURRECT,         0x0148);
-
-packet(SMSG_PLAYER_STATUS_CHANGE,    0x0119);
-packet(SMSG_PLAYER_GUILD_PARTY_INFO, 0x0195);
-packet(SMSG_BEING_STATUS_CHANGE,     0x0196);
-
-packet(SMSG_NPC_MESSAGE,             0x00b4);
-packet(SMSG_NPC_NEXT,                0x00b5);
-packet(SMSG_NPC_CLOSE,               0x00b6);
-packet(SMSG_NPC_CHOICE,              0x00b7);
-packet(SMSG_NPC_BUY_SELL_CHOICE,     0x00c4);
-packet(SMSG_NPC_BUY,                 0x00c6);
-packet(SMSG_NPC_SELL,                0x00c7);
-packet(SMSG_NPC_BUY_RESPONSE,        0x00ca);
-packet(SMSG_NPC_SELL_RESPONSE,       0x00cb);
-packet(SMSG_NPC_INT_INPUT,           0x0142);
-packet(SMSG_NPC_STR_INPUT,           0x01d4);
-packet(SMSG_PLAYER_CHAT,             0x008e);
-packet(SMSG_WHISPER,                 0x0097);
-packet(SMSG_WHISPER_RESPONSE,        0x0098);
-packet(SMSG_GM_CHAT,                 0x009a);
-packet(SMSG_WALK_RESPONSE,           0x0087);
-
-packet(SMSG_TRADE_REQUEST,           0x00e5);
-packet(SMSG_TRADE_RESPONSE,          0x00e7);
-packet(SMSG_TRADE_ITEM_ADD,          0x00e9);
-packet(SMSG_TRADE_ITEM_ADD_RESPONSE, 0x01b1);
-packet(SMSG_TRADE_OK,                0x00ec);
-packet(SMSG_TRADE_CANCEL,            0x00ee);
-packet(SMSG_TRADE_COMPLETE,          0x00f0);
-
-packet(SMSG_PARTY_CREATE,            0x00fa);
-packet(SMSG_PARTY_INFO,              0x00fb);
-packet(SMSG_PARTY_INVITE_RESPONSE,   0x00fd);
-packet(SMSG_PARTY_INVITED,           0x00fe);
-packet(SMSG_PARTY_SETTINGS,          0x0101);
-packet(SMSG_PARTY_MOVE,              0x0104);
-packet(SMSG_PARTY_LEAVE,             0x0105);
-packet(SMSG_PARTY_UPDATE_HP,         0x0106);
-packet(SMSG_PARTY_UPDATE_COORDS,     0x0107);
-packet(SMSG_PARTY_MESSAGE,           0x0109);
-
-packet(SMSG_PLAYER_STORAGE_ITEMS,    0x01f0);
-packet(SMSG_PLAYER_STORAGE_EQUIP,    0x00a6);
-packet(SMSG_PLAYER_STORAGE_STATUS,   0x00f2);
-packet(SMSG_PLAYER_STORAGE_ADD,      0x00f4);
-packet(SMSG_PLAYER_STORAGE_REMOVE,   0x00f6);
-packet(SMSG_PLAYER_STORAGE_CLOSE,    0x00f8);
-
-packet(SMSG_ADMIN_KICK_ACK,          0x00cd);
-
-packet(SMSG_GUILD_CREATE_RESPONSE,   0x0167);
-packet(SMSG_GUILD_POSITION_INFO,     0x016c);
-packet(SMSG_GUILD_MEMBER_LOGIN,      0x016d);
-packet(SMSG_GUILD_MASTER_OR_MEMBER,  0x014e);
-packet(SMSG_GUILD_BASIC_INFO,        0x01b6);
-packet(SMSG_GUILD_ALIANCE_INFO,      0x014c);
-packet(SMSG_GUILD_MEMBER_LIST,       0x0154);
-packet(SMSG_GUILD_POS_NAME_LIST,     0x0166);
-packet(SMSG_GUILD_POS_INFO_LIST,     0x0160);
-packet(SMSG_GUILD_POSITION_CHANGED,  0x0174);
-packet(SMSG_GUILD_MEMBER_POS_CHANGE, 0x0156);
-packet(SMSG_GUILD_EMBLEM_DATA,       0x0152);
-packet(SMSG_GUILD_SKILL_INFO,        0x0162);
-packet(SMSG_GUILD_NOTICE,            0x016f);
-packet(SMSG_GUILD_INVITE,            0x016a);
-packet(SMSG_GUILD_INVITE_ACK,        0x0169);
-packet(SMSG_GUILD_LEAVE,             0x015a);
-packet(SMSG_GUILD_EXPULSION,         0x015c);
-packet(SMSG_GUILD_EXPULSION_LIST,    0x0163);
-packet(SMSG_GUILD_MESSAGE,           0x017f);
-packet(SMSG_GUILD_SKILL_UP,          0x010e);
-packet(SMSG_GUILD_REQ_ALLIANCE,      0x0171);
-packet(SMSG_GUILD_REQ_ALLIANCE_ACK,  0x0173);
-packet(SMSG_GUILD_DEL_ALLIANCE,      0x0184);
-packet(SMSG_GUILD_OPPOSITION_ACK,    0x0181);
-packet(SMSG_GUILD_BROKEN,            0x015e);
-
-packet(SMSG_MVP_EFFECT,              0x010c);
-
-packet(SMSG_SOLVE_CHAR_NAME,         0x0194);
-packet(SMSG_SKILL_CASTING,           0x013e);
-packet(SMSG_SKILL_CAST_CANCEL,       0x01b9);
-packet(SMSG_SKILL_NO_DAMAGE,         0x011a);
-
-packet(SMSG_BEING_IP_RESPONSE,       0x020c);
-packet(SMSG_PVP_MAP_MODE,            0x0199);
-packet(SMSG_PVP_SET,                 0x019a);
-
-packet(SMSG_IGNORE_ALL_RESPONSE,     0x00d2);
-packet(SMSG_NPC_COMMAND,             0x0212);
-packet(SMSG_QUEST_SET_VAR,           0x0214);
-packet(SMSG_QUEST_PLAYER_VARS,       0x0215);
-packet(SMSG_BEING_MOVE3,             0x0225);
-packet(SMSG_MAP_MUSIC,               0x0227);
-packet(SMSG_NPC_CHANGETITLE,         0x0228);
-packet(SMSG_SCRIPT_MESSAGE,          0x0229);
+packet(SMSG_ADMIN_KICK_ACK,                0x00cd,   6);
+packet(SMSG_BEING_ACTION,                  0x008a,  29);
+packet(SMSG_BEING_CHANGE_DIRECTION,        0x009c,   9);
+packet(SMSG_BEING_CHANGE_LOOKS,            0x00c3,   8);
+packet(SMSG_BEING_CHANGE_LOOKS2,           0x01d7,  11);
+packet(SMSG_BEING_CHAT,                    0x008d,  -1);
+packet(SMSG_BEING_EMOTION,                 0x00c0,   7);
+packet(SMSG_BEING_IP_RESPONSE,             0x020c,  10);
+packet(SMSG_BEING_MOVE,                    0x007b,  60);
+packet(SMSG_BEING_MOVE2,                   0x0086,  16);
+packet(SMSG_BEING_MOVE3,                   0x0225,  -1);
+packet(SMSG_BEING_NAME_RESPONSE,           0x0095,  30);
+packet(SMSG_BEING_REMOVE,                  0x0080,   7);
+packet(SMSG_BEING_RESURRECT,               0x0148,   8);
+packet(SMSG_BEING_SELFEFFECT,              0x019b,  10);
+packet(SMSG_BEING_SPAWN,                   0x007c,  41);
+packet(SMSG_BEING_STATUS_CHANGE,           0x0196,   9);
+packet(SMSG_BEING_VISIBLE,                 0x0078,  54);
+packet(SMSG_CHANGE_MAP_SERVER,             0x0092,  28);
+packet(SMSG_CHAR_CREATE_FAILED,            0x006e,   3);
+packet(SMSG_CHAR_CREATE_SUCCEEDED,         0x006d, 108);
+packet(SMSG_CHAR_DELETE_FAILED,            0x0070,   3);
+packet(SMSG_CHAR_DELETE_SUCCEEDED,         0x006f,   2);
+packet(SMSG_CHAR_LOGIN,                    0x006b,  -1);
+packet(SMSG_CHAR_LOGIN_ERROR,              0x006c,   3);
+packet(SMSG_CHAR_MAP_INFO,                 0x0071,  28);
+packet(SMSG_CHAR_PASSWORD_RESPONSE,        0x0062,   3);
+packet(SMSG_CHAR_SWITCH_RESPONSE,          0x00b3,   3);
+packet(SMSG_CONNECTION_PROBLEM,            0x0081,   3);
+packet(SMSG_GM_CHAT,                       0x009a,  -1);
+packet(SMSG_GUILD_ALIANCE_INFO,            0x014c,  -1);
+packet(SMSG_GUILD_BASIC_INFO,              0x01b6, 114);
+packet(SMSG_GUILD_BROKEN,                  0x015e,   6);
+packet(SMSG_GUILD_CREATE_RESPONSE,         0x0167,   3);
+packet(SMSG_GUILD_DEL_ALLIANCE,            0x0184,  10);
+packet(SMSG_GUILD_EMBLEM_DATA,             0x0152,  -1);
+packet(SMSG_GUILD_EXPULSION,               0x015c,  90);
+packet(SMSG_GUILD_EXPULSION_LIST,          0x0163,  -1);
+packet(SMSG_GUILD_INVITE,                  0x016a,  30);
+packet(SMSG_GUILD_INVITE_ACK,              0x0169,   3);
+packet(SMSG_GUILD_LEAVE,                   0x015a,  66);
+packet(SMSG_GUILD_MASTER_OR_MEMBER,        0x014e,   6);
+packet(SMSG_GUILD_MEMBER_LIST,             0x0154,  -1);
+packet(SMSG_GUILD_MEMBER_LOGIN,            0x016d,  14);
+packet(SMSG_GUILD_MEMBER_POS_CHANGE,       0x0156,  -1);
+packet(SMSG_GUILD_MESSAGE,                 0x017f,  -1);
+packet(SMSG_GUILD_NOTICE,                  0x016f, 182);
+packet(SMSG_GUILD_OPPOSITION_ACK,          0x0181,   3);
+packet(SMSG_GUILD_POSITION_CHANGED,        0x0174,  -1);
+packet(SMSG_GUILD_POSITION_INFO,           0x016c,  43);
+packet(SMSG_GUILD_POS_INFO_LIST,           0x0160,  -1);
+packet(SMSG_GUILD_POS_NAME_LIST,           0x0166,  -1);
+packet(SMSG_GUILD_REQ_ALLIANCE,            0x0171,  30);
+packet(SMSG_GUILD_REQ_ALLIANCE_ACK,        0x0173,   3);
+packet(SMSG_GUILD_SKILL_INFO,              0x0162,  -1);
+packet(SMSG_GUILD_SKILL_UP,                0x010e,  11);
+packet(SMSG_IGNORE_ALL_RESPONSE,           0x00d2,   4);
+packet(SMSG_ITEM_DROPPED,                  0x009e,  17);
+packet(SMSG_ITEM_REMOVE,                   0x00a1,   6);
+packet(SMSG_ITEM_USE_RESPONSE,             0x00a8,   7);
+packet(SMSG_ITEM_VISIBLE,                  0x009d,  17);
+packet(SMSG_LOGIN_DATA,                    0x0069,  -1);
+packet(SMSG_LOGIN_ERROR,                   0x006a,  23);
+packet(SMSG_MAP_LOGIN_SUCCESS,             0x0073,  11);
+packet(SMSG_MAP_MUSIC,                     0x0227,  -1);
+packet(SMSG_MAP_QUIT_RESPONSE,             0x018b,   4);
+packet(SMSG_MVP_EFFECT,                    0x010c,   6);
+packet(SMSG_NPC_BUY,                       0x00c6,  -1);
+packet(SMSG_NPC_BUY_RESPONSE,              0x00ca,   3);
+packet(SMSG_NPC_BUY_SELL_CHOICE,           0x00c4,   6);
+packet(SMSG_NPC_CHANGETITLE,               0x0228,  -1);
+packet(SMSG_NPC_CHOICE,                    0x00b7,  -1);
+packet(SMSG_NPC_CLOSE,                     0x00b6,   6);
+packet(SMSG_NPC_COMMAND,                   0x0212,  16);
+packet(SMSG_NPC_INT_INPUT,                 0x0142,   6);
+packet(SMSG_NPC_MESSAGE,                   0x00b4,  -1);
+packet(SMSG_NPC_NEXT,                      0x00b5,   6);
+packet(SMSG_NPC_SELL,                      0x00c7,  -1);
+packet(SMSG_NPC_SELL_RESPONSE,             0x00cb,   3);
+packet(SMSG_NPC_STR_INPUT,                 0x01d4,   6);
+packet(SMSG_PARTY_CREATE,                  0x00fa,   3);
+packet(SMSG_PARTY_INFO,                    0x00fb,  -1);
+packet(SMSG_PARTY_INVITED,                 0x00fe,  30);
+packet(SMSG_PARTY_INVITE_RESPONSE,         0x00fd,  27);
+packet(SMSG_PARTY_LEAVE,                   0x0105,  31);
+packet(SMSG_PARTY_MESSAGE,                 0x0109,  -1);
+packet(SMSG_PARTY_MOVE,                    0x0104,  79);
+packet(SMSG_PARTY_SETTINGS,                0x0101,   6);
+packet(SMSG_PARTY_UPDATE_COORDS,           0x0107,  10);
+packet(SMSG_PARTY_UPDATE_HP,               0x0106,  10);
+packet(SMSG_PLAYER_ARROW_EQUIP,            0x013c,   4);
+packet(SMSG_PLAYER_ARROW_MESSAGE,          0x013b,   4);
+packet(SMSG_PLAYER_ATTACK_RANGE,           0x013a,   4);
+packet(SMSG_PLAYER_CHAT,                   0x008e,  -1);
+packet(SMSG_PLAYER_EQUIP,                  0x00aa,   7);
+packet(SMSG_PLAYER_EQUIPMENT,              0x00a4,  -1);
+packet(SMSG_PLAYER_GUILD_PARTY_INFO,       0x0195, 102);
+packet(SMSG_PLAYER_INVENTORY,              0x01ee,  -1);
+packet(SMSG_PLAYER_INVENTORY_ADD,          0x00a0,  23);
+packet(SMSG_PLAYER_INVENTORY_REMOVE,       0x00af,   6);
+packet(SMSG_PLAYER_INVENTORY_USE,          0x01c8,  13);
+packet(SMSG_PLAYER_MOVE,                   0x01da,  60);
+packet(SMSG_PLAYER_MOVE_TO_ATTACK,         0x0139,  16);
+packet(SMSG_PLAYER_SKILLS,                 0x010f,  -1);
+packet(SMSG_PLAYER_SKILL_UP,               0x010e,  11);
+packet(SMSG_PLAYER_STATUS_CHANGE,          0x0119,  13);
+packet(SMSG_PLAYER_STAT_UPDATE_1,          0x00b0,   8);
+packet(SMSG_PLAYER_STAT_UPDATE_2,          0x00b1,   8);
+packet(SMSG_PLAYER_STAT_UPDATE_3,          0x0141,  14);
+packet(SMSG_PLAYER_STAT_UPDATE_4,          0x00bc,   6);
+packet(SMSG_PLAYER_STAT_UPDATE_5,          0x00bd,  44);
+packet(SMSG_PLAYER_STAT_UPDATE_6,          0x00be,   5);
+packet(SMSG_PLAYER_STOP,                   0x0088,  10);
+packet(SMSG_PLAYER_STORAGE_ADD,            0x00f4,  21);
+packet(SMSG_PLAYER_STORAGE_CLOSE,          0x00f8,   2);
+packet(SMSG_PLAYER_STORAGE_EQUIP,          0x00a6,  -1);
+packet(SMSG_PLAYER_STORAGE_ITEMS,          0x01f0,  -1);
+packet(SMSG_PLAYER_STORAGE_REMOVE,         0x00f6,   8);
+packet(SMSG_PLAYER_STORAGE_STATUS,         0x00f2,   6);
+packet(SMSG_PLAYER_UNEQUIP,                0x00ac,   7);
+packet(SMSG_PLAYER_UPDATE_1,               0x01d8,  54);
+packet(SMSG_PLAYER_UPDATE_2,               0x01d9,  53);
+packet(SMSG_PLAYER_WARP,                   0x0091,  22);
+packet(SMSG_PVP_MAP_MODE,                  0x0199,   4);
+packet(SMSG_PVP_SET,                       0x019a,  14);
+packet(SMSG_QUEST_PLAYER_VARS,             0x0215,  -1);
+packet(SMSG_QUEST_SET_VAR,                 0x0214,   8);
+packet(SMSG_SCRIPT_MESSAGE,                0x0229,  -1);
+packet(SMSG_SERVER_PING,                   0x007f,   6);
+packet(SMSG_SERVER_VERSION_RESPONSE,       0x7531,  10);
+packet(SMSG_SKILL_CASTING,                 0x013e,  24);
+packet(SMSG_SKILL_CAST_CANCEL,             0x01b9,   6);
+packet(SMSG_SKILL_DAMAGE,                  0x01de,  33);
+packet(SMSG_SKILL_FAILED,                  0x0110,  10);
+packet(SMSG_SKILL_NO_DAMAGE,               0x011a,  15);
+packet(SMSG_SOLVE_CHAR_NAME,               0x0194,  30);
+packet(SMSG_TRADE_CANCEL,                  0x00ee,   2);
+packet(SMSG_TRADE_COMPLETE,                0x00f0,   3);
+packet(SMSG_TRADE_ITEM_ADD,                0x00e9,  19);
+packet(SMSG_TRADE_ITEM_ADD_RESPONSE,       0x01b1,   7);
+packet(SMSG_TRADE_OK,                      0x00ec,   3);
+packet(SMSG_TRADE_REQUEST,                 0x00e5,  26);
+packet(SMSG_TRADE_RESPONSE,                0x00e7,   3);
+packet(SMSG_UPDATE_HOST,                   0x0063,  -1);
+packet(SMSG_WALK_RESPONSE,                 0x0087,  12);
+packet(SMSG_WHISPER,                       0x0097,  -1);
+packet(SMSG_WHISPER_RESPONSE,              0x0098,   3);
+packet(SMSG_WHO_ANSWER,                    0x00c2,   6);
diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h
index 71e2a6981..43eff2c85 100644
--- a/src/net/tmwa/protocol.h
+++ b/src/net/tmwa/protocol.h
@@ -23,11 +23,12 @@
 #ifndef NET_TMWA_PROTOCOL_H
 #define NET_TMWA_PROTOCOL_H
 
-#include "net/protocoldefine.h"
-
+#include "net/protocolindefine.h"
 #include "net/tmwa/packetsin.inc"
-#include "net/tmwa/packetsout.inc"
+#undef packet
 
+#include "net/protocoloutdefine.h"
+#include "net/tmwa/packetsout.inc"
 #undef packet
 
 #endif  // NET_TMWA_PROTOCOL_H