diff options
| author | David Athay <ko2fan@gmail.com> | 2009-05-21 10:20:32 +0100 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2009-05-21 10:20:32 +0100 |
| commit | 2dad08e4e8e199c84da6a6f2f5289c8c0e40fc81 (patch) | |
| tree | 293d4922893dfffcc065604743116e653c3b8d37 /src/net/tmwserv/protocol.h | |
| parent | dc1eb0895382451b1c79c60ecb7ca7dbbec89681 (diff) | |
| parent | 244b0d9b46128ab3498da078020c8bbf8c65f69f (diff) | |
| download | mana-client-2dad08e4e8e199c84da6a6f2f5289c8c0e40fc81.tar.gz mana-client-2dad08e4e8e199c84da6a6f2f5289c8c0e40fc81.tar.bz2 mana-client-2dad08e4e8e199c84da6a6f2f5289c8c0e40fc81.tar.xz mana-client-2dad08e4e8e199c84da6a6f2f5289c8c0e40fc81.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/net/tmwserv/protocol.h')
| -rw-r--r-- | src/net/tmwserv/protocol.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/net/tmwserv/protocol.h b/src/net/tmwserv/protocol.h index 7fa3b372..6124263a 100644 --- a/src/net/tmwserv/protocol.h +++ b/src/net/tmwserv/protocol.h @@ -106,7 +106,7 @@ enum { GPMSG_BEING_DIR_CHANGE = 0x0273, // W being id, B direction GPMSG_BEINGS_MOVE = 0x0280, // { W being id, B flags [, C position, B speed] [, W*2 destination] }* GPMSG_ITEMS = 0x0281, // { W item id, W*2 position }* - PGMSG_ATTACK = 0x0290, // B direction + PGMSG_ATTACK = 0x0290, // W being id PGMSG_USE_SPECIAL = 0x0292, // B specialID GPMSG_BEING_ATTACK = 0x0291, // W being id PGMSG_SAY = 0x02A0, // S text @@ -162,9 +162,11 @@ enum { CPMSG_GUILD_QUIT_RESPONSE = 0x0361, // B error PCMSG_GUILD_PROMOTE_MEMBER = 0x0365, // W guild, S name, B rights CPMSG_GUILD_PROMOTE_MEMBER_RESPONSE = 0x0366, // B error + PCMSG_GUILD_KICK_MEMBER = 0x0370, // W guild, S name + CPMSG_GUILD_KICK_MEMBER_RESPONSE = 0x0371, // B error - CPMSG_GUILD_INVITED = 0x0370, // S char name, S guild name, W id - CPMSG_GUILD_REJOIN = 0x0371, // S name, W guild, W rights, W channel, S announce + CPMSG_GUILD_INVITED = 0x0388, // S char name, S guild name, W id + CPMSG_GUILD_REJOIN = 0x0389, // S name, W guild, W rights, W channel, S announce // Party PCMSG_PARTY_INVITE = 0x03A0, // S name |