summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-03-10 21:41:43 +0300
committerAndrei Karas <akaras@inbox.ru>2015-03-10 21:41:43 +0300
commit421f7cf60e960b340a70fc75022ffaff2558eb48 (patch)
tree2c67a12a5472c906a6ac92691ed239f020a474d8 /src
parent0295c338fcb43f10f6dbc664c0f86021464248c7 (diff)
downloadmanaplus-421f7cf60e960b340a70fc75022ffaff2558eb48.tar.gz
manaplus-421f7cf60e960b340a70fc75022ffaff2558eb48.tar.bz2
manaplus-421f7cf60e960b340a70fc75022ffaff2558eb48.tar.xz
manaplus-421f7cf60e960b340a70fc75022ffaff2558eb48.zip
Rename packet SMSG_MVP into SMSG_MVP_EFFECT.
Diffstat (limited to 'src')
-rw-r--r--src/net/ea/chathandler.cpp6
-rw-r--r--src/net/ea/chathandler.h2
-rw-r--r--src/net/eathena/chathandler.cpp6
-rw-r--r--src/net/eathena/protocol.h2
-rw-r--r--src/net/tmwa/chathandler.cpp6
-rw-r--r--src/net/tmwa/protocol.h2
6 files changed, 12 insertions, 12 deletions
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 30bef2118..68a9fdbdf 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -153,9 +153,9 @@ void ChatHandler::processWhisperResponseContinue(const uint8_t type)
BLOCK_END("ChatHandler::processWhisperResponse")
}
-void ChatHandler::processMVP(Net::MessageIn &msg)
+void ChatHandler::processMVPEffect(Net::MessageIn &msg)
{
- BLOCK_START("ChatHandler::processMVP")
+ BLOCK_START("ChatHandler::processMVPEffect")
// Display MVP player
const int id = msg.readInt32("being id");
if (localChatTab && actorManager && config.getBoolValue("showMVP"))
@@ -166,7 +166,7 @@ void ChatHandler::processMVP(Net::MessageIn &msg)
else
NotifyManager::notify(NotifyTypes::MVP_PLAYER, being->getName());
}
- BLOCK_END("ChatHandler::processMVP")
+ BLOCK_END("ChatHandler::processMVPEffect")
}
void ChatHandler::processIgnoreAllResponse(Net::MessageIn &msg)
diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h
index fd2a67fa7..2ed9282f8 100644
--- a/src/net/ea/chathandler.h
+++ b/src/net/ea/chathandler.h
@@ -47,7 +47,7 @@ class ChatHandler notfinal : public Net::ChatHandler
void me(const std::string &restrict text,
const std::string &restrict channel) const override final;
- static void processMVP(Net::MessageIn &msg);
+ static void processMVPEffect(Net::MessageIn &msg);
static void processIgnoreAllResponse(Net::MessageIn &msg);
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index 07d57dcd0..92aefa370 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -65,7 +65,7 @@ ChatHandler::ChatHandler() :
SMSG_WHISPER_RESPONSE,
SMSG_GM_CHAT,
SMSG_GM_CHAT2,
- SMSG_MVP,
+ SMSG_MVP_EFFECT,
SMSG_IGNORE_ALL_RESPONSE,
SMSG_COLOR_MESSAGE,
SMSG_CHAT_IGNORE_LIST,
@@ -135,8 +135,8 @@ void ChatHandler::handleMessage(Net::MessageIn &msg)
processGmChat2(msg);
break;
- case SMSG_MVP:
- processMVP(msg);
+ case SMSG_MVP_EFFECT:
+ processMVPEffect(msg);
break;
case SMSG_IGNORE_ALL_RESPONSE:
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index 0953b82d9..e65f84e61 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -251,7 +251,7 @@
#define SMSG_QUEST_ACTIVATE 0x02b7
#define SMSG_QUEST_NPC_EFFECT 0x0446
-#define SMSG_MVP 0x010c
+#define SMSG_MVP_EFFECT 0x010c
#define SMSG_RANKS_LIST 0x097d
#define SMSG_MONSTER_HP 0x0977
#define SMSG_PLAYER_HP 0x080e
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index e4066e91f..75d14e7ce 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -65,7 +65,7 @@ ChatHandler::ChatHandler() :
SMSG_WHISPER,
SMSG_WHISPER_RESPONSE,
SMSG_GM_CHAT,
- SMSG_MVP, // MVP
+ SMSG_MVP_EFFECT,
SMSG_IGNORE_ALL_RESPONSE,
0
};
@@ -109,8 +109,8 @@ void ChatHandler::handleMessage(Net::MessageIn &msg)
processGmChat(msg);
break;
- case SMSG_MVP:
- processMVP(msg);
+ case SMSG_MVP_EFFECT:
+ processMVPEffect(msg);
break;
case SMSG_IGNORE_ALL_RESPONSE:
diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h
index 9fbcb0bba..a5c959878 100644
--- a/src/net/tmwa/protocol.h
+++ b/src/net/tmwa/protocol.h
@@ -185,7 +185,7 @@
#define SMSG_GUILD_OPPOSITION_ACK 0x0181
#define SMSG_GUILD_BROKEN 0x015e
-#define SMSG_MVP 0x010c
+#define SMSG_MVP_EFFECT 0x010c
/**********************************
* Packets from client to server *