summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-12 22:15:28 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-13 17:41:29 +0300
commit4126cb4fe777efc94e55c1d2397e417ea9332754 (patch)
treeeb478ebbfab3a6c9e0291b3e02cdf75089f93c3c /src/net
parentf06bf7de45d34f27fe5e4384abc4ea0d22bb063f (diff)
downloadplus-4126cb4fe777efc94e55c1d2397e417ea9332754.tar.gz
plus-4126cb4fe777efc94e55c1d2397e417ea9332754.tar.bz2
plus-4126cb4fe777efc94e55c1d2397e417ea9332754.tar.xz
plus-4126cb4fe777efc94e55c1d2397e417ea9332754.zip
Remove duplicate packet id CMSG_PLAYER_ATTACK.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/eathena/playerhandler.cpp2
-rw-r--r--src/net/eathena/protocol.h1
-rw-r--r--src/net/tmwa/playerhandler.cpp2
-rw-r--r--src/net/tmwa/protocol.h1
4 files changed, 2 insertions, 4 deletions
diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp
index c677cd3f8..52e3d0b6f 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -125,7 +125,7 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
void PlayerHandler::attack(const int id, const bool keep) const
{
- MessageOut outMsg(CMSG_PLAYER_ATTACK);
+ MessageOut outMsg(CMSG_PLAYER_CHANGE_ACT);
outMsg.writeInt32(id);
if (keep)
outMsg.writeInt8(7);
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index 38b3171f2..3e501a338 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -257,7 +257,6 @@
#define CMSG_PLAYER_CHANGE_ACT 0x0871
#define CMSG_PLAYER_RESTART 0x00b2
#define CMSG_PLAYER_EMOTE 0x00bf
-#define CMSG_PLAYER_ATTACK 0x0871
#define CMSG_PLAYER_STOP_ATTACK 0x0118
#define CMSG_WHO_REQUEST 0x00c1
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index d8c7bf356..c4c61bed4 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -140,7 +140,7 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
void PlayerHandler::attack(const int id, const bool keep) const
{
- MessageOut outMsg(CMSG_PLAYER_ATTACK);
+ MessageOut outMsg(CMSG_PLAYER_CHANGE_ACT);
outMsg.writeInt32(id);
if (keep)
outMsg.writeInt8(7);
diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h
index 0b158c342..df5425574 100644
--- a/src/net/tmwa/protocol.h
+++ b/src/net/tmwa/protocol.h
@@ -228,7 +228,6 @@
#define CMSG_PLAYER_CHANGE_ACT 0x0089
#define CMSG_PLAYER_RESTART 0x00b2
#define CMSG_PLAYER_EMOTE 0x00bf
-#define CMSG_PLAYER_ATTACK 0x0089
#define CMSG_PLAYER_STOP_ATTACK 0x0118
#define CMSG_WHO_REQUEST 0x00c1