summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-03-11 15:32:28 +0300
committerAndrei Karas <akaras@inbox.ru>2015-03-11 15:32:28 +0300
commit8c1ff1cb9ab58bee5b8b48591485247125243464 (patch)
tree04398638bd66d147d9ba23833dbe7f03fa8ffc6a
parenteae805845ace52c0056e7e426c5c8b3831e638af (diff)
downloadmv-8c1ff1cb9ab58bee5b8b48591485247125243464.tar.gz
mv-8c1ff1cb9ab58bee5b8b48591485247125243464.tar.bz2
mv-8c1ff1cb9ab58bee5b8b48591485247125243464.tar.xz
mv-8c1ff1cb9ab58bee5b8b48591485247125243464.zip
Rename packet SMSG_GUILD_EMBLEM into SMSG_GUILD_EMBLEM_DATA.
-rw-r--r--src/net/ea/guildhandler.cpp2
-rw-r--r--src/net/ea/guildhandler.h2
-rw-r--r--src/net/eathena/guildhandler.cpp6
-rw-r--r--src/net/eathena/protocol.h2
-rw-r--r--src/net/tmwa/guildhandler.cpp6
-rw-r--r--src/net/tmwa/protocol.h2
6 files changed, 10 insertions, 10 deletions
diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp
index a42141734..3b15062ff 100644
--- a/src/net/ea/guildhandler.cpp
+++ b/src/net/ea/guildhandler.cpp
@@ -316,7 +316,7 @@ void GuildHandler::processGuildMemberPosChange(Net::MessageIn &msg)
}
}
-void GuildHandler::processGuildEmblem(Net::MessageIn &msg)
+void GuildHandler::processGuildEmblemData(Net::MessageIn &msg)
{
const int length = msg.readInt16("len");
diff --git a/src/net/ea/guildhandler.h b/src/net/ea/guildhandler.h
index e65b9932a..0485e5cfc 100644
--- a/src/net/ea/guildhandler.h
+++ b/src/net/ea/guildhandler.h
@@ -69,7 +69,7 @@ class GuildHandler notfinal : public Net::GuildHandler
static void processGuildMemberPosChange(Net::MessageIn &msg);
- static void processGuildEmblem(Net::MessageIn &msg);
+ static void processGuildEmblemData(Net::MessageIn &msg);
static void processGuildSkillInfo(Net::MessageIn &msg);
diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp
index 86a0b2d03..241ff2bb3 100644
--- a/src/net/eathena/guildhandler.cpp
+++ b/src/net/eathena/guildhandler.cpp
@@ -59,7 +59,7 @@ GuildHandler::GuildHandler() :
SMSG_GUILD_POS_INFO_LIST,
SMSG_GUILD_POSITION_CHANGED,
SMSG_GUILD_MEMBER_POS_CHANGE,
- SMSG_GUILD_EMBLEM,
+ SMSG_GUILD_EMBLEM_DATA,
SMSG_GUILD_SKILL_INFO,
SMSG_GUILD_NOTICE,
SMSG_GUILD_INVITE,
@@ -134,8 +134,8 @@ void GuildHandler::handleMessage(Net::MessageIn &msg)
processGuildMemberPosChange(msg);
break;
- case SMSG_GUILD_EMBLEM:
- processGuildEmblem(msg);
+ case SMSG_GUILD_EMBLEM_DATA:
+ processGuildEmblemData(msg);
break;
case SMSG_GUILD_SKILL_INFO:
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index 02c024c88..5e8d85919 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -237,7 +237,7 @@
#define SMSG_GUILD_POS_INFO_LIST 0x0160
#define SMSG_GUILD_POSITION_CHANGED 0x0174
#define SMSG_GUILD_MEMBER_POS_CHANGE 0x0156
-#define SMSG_GUILD_EMBLEM 0x0152
+#define SMSG_GUILD_EMBLEM_DATA 0x0152
#define SMSG_GUILD_SKILL_INFO 0x0162
#define SMSG_GUILD_NOTICE 0x016f
#define SMSG_GUILD_INVITE 0x016a
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index 4796ce5c8..60cdbd453 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -61,7 +61,7 @@ GuildHandler::GuildHandler() :
SMSG_GUILD_POS_INFO_LIST,
SMSG_GUILD_POSITION_CHANGED,
SMSG_GUILD_MEMBER_POS_CHANGE,
- SMSG_GUILD_EMBLEM,
+ SMSG_GUILD_EMBLEM_DATA,
SMSG_GUILD_SKILL_INFO,
SMSG_GUILD_NOTICE,
SMSG_GUILD_INVITE,
@@ -139,8 +139,8 @@ void GuildHandler::handleMessage(Net::MessageIn &msg)
processGuildMemberPosChange(msg);
break;
- case SMSG_GUILD_EMBLEM:
- processGuildEmblem(msg);
+ case SMSG_GUILD_EMBLEM_DATA:
+ processGuildEmblemData(msg);
break;
case SMSG_GUILD_SKILL_INFO:
diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h
index a5c959878..82ba472ab 100644
--- a/src/net/tmwa/protocol.h
+++ b/src/net/tmwa/protocol.h
@@ -169,7 +169,7 @@
#define SMSG_GUILD_POS_INFO_LIST 0x0160
#define SMSG_GUILD_POSITION_CHANGED 0x0174
#define SMSG_GUILD_MEMBER_POS_CHANGE 0x0156
-#define SMSG_GUILD_EMBLEM 0x0152
+#define SMSG_GUILD_EMBLEM_DATA 0x0152
#define SMSG_GUILD_SKILL_INFO 0x0162
#define SMSG_GUILD_NOTICE 0x016f
#define SMSG_GUILD_INVITE 0x016a