diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2011-05-09 09:34:12 -0700 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2011-05-09 10:54:07 -0600 |
| commit | 1d6311a5ffde800ece8d3085fb5fe7c2c9c50a58 (patch) | |
| tree | 763ea7636ea6a19f8e00176c8ea5d33595ee7d9f | |
| parent | d541170c0258217efdb02a4eb2303ddda1c9e774 (diff) | |
| download | mana-1d6311a5ffde800ece8d3085fb5fe7c2c9c50a58.tar.gz mana-1d6311a5ffde800ece8d3085fb5fe7c2c9c50a58.tar.bz2 mana-1d6311a5ffde800ece8d3085fb5fe7c2c9c50a58.tar.xz mana-1d6311a5ffde800ece8d3085fb5fe7c2c9c50a58.zip | |
Remove or comment duplicate tmwA packets, and fix a typo
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
| -rw-r--r-- | src/net/tmwa/inventoryhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/protocol.h | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp index aa084264..edb5e53f 100644 --- a/src/net/tmwa/inventoryhandler.cpp +++ b/src/net/tmwa/inventoryhandler.cpp @@ -522,7 +522,7 @@ void InventoryHandler::event(Event::Channel channel, else if (source == Inventory::STORAGE && destination == Inventory::INVENTORY) { - MessageOut outMsg(CSMG_MOVE_FROM_STORAGE); + MessageOut outMsg(CMSG_MOVE_FROM_STORAGE); outMsg.writeInt16(index - INVENTORY_OFFSET + STORAGE_OFFSET); outMsg.writeInt32(amount); diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h index 0a768d5d..d7cb81e5 100644 --- a/src/net/tmwa/protocol.h +++ b/src/net/tmwa/protocol.h @@ -111,7 +111,7 @@ static const int STORAGE_OFFSET = 1; #define SMSG_PLAYER_ARROW_EQUIP 0x013c #define SMSG_PLAYER_ARROW_MESSAGE 0x013b #define SMSG_PLAYER_SKILLS 0x010f -#define SMSG_PLAYER_SKILL_UP 0x010e +#define SMSG_PLAYER_SKILL_UP 0x010e // same as SMSG_GUILD_SKILL_UP #define SMSG_SKILL_FAILED 0x0110 #define SMSG_SKILL_DAMAGE 0x01de #define SMSG_ITEM_USE_RESPONSE 0x00a8 @@ -203,7 +203,7 @@ static const int STORAGE_OFFSET = 1; #define SMSG_GUILD_EXPULSION 0x015c #define SMSG_GUILD_EXPULSION_LIST 0x0163 #define SMSG_GUILD_MESSAGE 0x017f -#define SMSG_GUILD_SKILL_UP 0x010e +#define SMSG_GUILD_SKILL_UP 0x010e // same as SMSG_PLAYER_SKILL_UP #define SMSG_GUILD_REQ_ALLIANCE 0x0171 #define SMSG_GUILD_REQ_ALLIANCE_ACK 0x0173 #define SMSG_GUILD_DEL_ALLIANCE 0x0184 @@ -230,8 +230,6 @@ static const int STORAGE_OFFSET = 1; #define CMSG_CHAT_MESSAGE 0x008c #define CMSG_CHAT_WHISPER 0x0096 -#define CMSG_CHAT_ANNOUNCE 0x0099 -#define CMSG_CHAT_WHO 0x00c1 #define CMSG_SKILL_LEVELUP_REQUEST 0x0112 #define CMSG_STAT_UPDATE_REQUEST 0x00bb @@ -249,10 +247,10 @@ static const int STORAGE_OFFSET = 1; #define CMSG_ITEM_PICKUP 0x009f #define CMSG_PLAYER_CHANGE_DIR 0x009b #define CMSG_PLAYER_CHANGE_DEST 0x0085 -#define CMSG_PLAYER_CHANGE_ACT 0x0089 +#define CMSG_PLAYER_CHANGE_ACT 0x0089 // same as CMSG_PLAYER_ATTACK #define CMSG_PLAYER_RESTART 0x00b2 #define CMSG_PLAYER_EMOTE 0x00bf -#define CMSG_PLAYER_ATTACK 0x0089 +#define CMSG_PLAYER_ATTACK 0x0089 // same as CMSG_PLAYER_CHANGE_ACT #define CMSG_WHO_REQUEST 0x00c1 #define CMSG_NPC_TALK 0x0090 @@ -281,7 +279,7 @@ static const int STORAGE_OFFSET = 1; #define CMSG_PARTY_MESSAGE 0x0108 #define CMSG_MOVE_TO_STORAGE 0x00f3 /** Move item to storage */ -#define CSMG_MOVE_FROM_STORAGE 0x00f5 /** Remove item from storage */ +#define CMSG_MOVE_FROM_STORAGE 0x00f5 /** Remove item from storage */ #define CMSG_CLOSE_STORAGE 0x00f7 /** Request storage close */ #define CMSG_ADMIN_ANNOUNCE 0x0099 |