summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/net/eathena/chathandler.cpp66
-rw-r--r--src/net/eathena/chathandler.h16
-rw-r--r--src/net/eathena/protocol.h18
3 files changed, 50 insertions, 50 deletions
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index f0587602d..d60661b9f 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -76,16 +76,16 @@ ChatHandler::ChatHandler() :
SMSG_FORMAT_MESSAGE_NUMBER,
SMSG_FORMAT_MESSAGE_SKILL,
SMSG_CHAT_DISPLAY,
- SMSG_CHAT_JOIN_ACK,
- SMSG_CHAT_LEAVE,
+ SMSG_CHAT_ROOM_JOIN_ACK,
+ SMSG_CHAT_ROOM_LEAVE,
SMSG_CHAT_JOIN_CHANNEL,
SMSG_IGNORE_NICK_ACK,
- SMSG_CHAT_CREATE_ACK,
- SMSG_CHAT_DESTROY,
- SMSG_CHAT_JOIN_FAILED,
- SMSG_CHAT_ADD_MEMBER,
- SMSG_CHAT_SETTINGS,
- SMSG_CHAT_ROLE_CHANGE,
+ SMSG_CHAT_ROOM_CREATE_ACK,
+ SMSG_CHAT_ROOM_DESTROY,
+ SMSG_CHAT_ROOM_JOIN_FAILED,
+ SMSG_CHAT_ROOM_ADD_MEMBER,
+ SMSG_CHAT_ROOM_SETTINGS,
+ SMSG_CHAT_ROOM_ROLE_CHANGE,
SMSG_MANNER_MESSAGE,
SMSG_CHAT_SILENCE,
SMSG_CHAT_TALKIE_BOX,
@@ -171,12 +171,12 @@ void ChatHandler::handleMessage(Net::MessageIn &msg)
processChatDisplay(msg);
break;
- case SMSG_CHAT_JOIN_ACK:
- processChatJoinAck(msg);
+ case SMSG_CHAT_ROOM_JOIN_ACK:
+ processChatRoomJoinAck(msg);
break;
- case SMSG_CHAT_LEAVE:
- processChatLeave(msg);
+ case SMSG_CHAT_ROOM_LEAVE:
+ processChatRoomLeave(msg);
break;
case SMSG_CHAT_JOIN_CHANNEL:
@@ -187,28 +187,28 @@ void ChatHandler::handleMessage(Net::MessageIn &msg)
processIgnoreNickAck(msg);
break;
- case SMSG_CHAT_CREATE_ACK:
- processChatCreateAck(msg);
+ case SMSG_CHAT_ROOM_CREATE_ACK:
+ processChatRoomCreateAck(msg);
break;
- case SMSG_CHAT_DESTROY:
- processChatDestroy(msg);
+ case SMSG_CHAT_ROOM_DESTROY:
+ processChatRoomDestroy(msg);
break;
- case SMSG_CHAT_JOIN_FAILED:
- processChatJoinFailed(msg);
+ case SMSG_CHAT_ROOM_JOIN_FAILED:
+ processChatRoomJoinFailed(msg);
break;
- case SMSG_CHAT_ADD_MEMBER:
- processChatAddMember(msg);
+ case SMSG_CHAT_ROOM_ADD_MEMBER:
+ processChatRoomAddMember(msg);
break;
- case SMSG_CHAT_SETTINGS:
- processChatSettings(msg);
+ case SMSG_CHAT_ROOM_SETTINGS:
+ processChatRoomSettings(msg);
break;
- case SMSG_CHAT_ROLE_CHANGE:
- processChatRoleChange(msg);
+ case SMSG_CHAT_ROOM_ROLE_CHANGE:
+ processChatRoomRoleChange(msg);
break;
case SMSG_MANNER_MESSAGE:
@@ -667,12 +667,12 @@ void ChatHandler::joinChat(const ChatObject *const chat,
if (!chat)
return;
- createOutPacket(CMSG_CHAT_JOIN);
+ createOutPacket(CMSG_CHAT_ROOM_JOIN);
outMsg.writeInt32(chat->chatId, "chat id");
outMsg.writeString(password, 8, "password");
}
-void ChatHandler::processChatJoinAck(Net::MessageIn &msg)
+void ChatHandler::processChatRoomJoinAck(Net::MessageIn &msg)
{
UNIMPLIMENTEDPACKET;
const int count = msg.readInt16("len") - 8;
@@ -684,7 +684,7 @@ void ChatHandler::processChatJoinAck(Net::MessageIn &msg)
}
}
-void ChatHandler::processChatLeave(Net::MessageIn &msg)
+void ChatHandler::processChatRoomLeave(Net::MessageIn &msg)
{
UNIMPLIMENTEDPACKET;
msg.readInt16("users");
@@ -841,32 +841,32 @@ void ChatHandler::talkPet(const std::string &restrict text,
outMsg.writeInt8(0, "zero byte");
}
-void ChatHandler::processChatCreateAck(Net::MessageIn &msg)
+void ChatHandler::processChatRoomCreateAck(Net::MessageIn &msg)
{
UNIMPLIMENTEDPACKET;
msg.readUInt8("flag");
}
-void ChatHandler::processChatDestroy(Net::MessageIn &msg)
+void ChatHandler::processChatRoomDestroy(Net::MessageIn &msg)
{
UNIMPLIMENTEDPACKET;
msg.readInt32("chat id");
}
-void ChatHandler::processChatJoinFailed(Net::MessageIn &msg)
+void ChatHandler::processChatRoomJoinFailed(Net::MessageIn &msg)
{
UNIMPLIMENTEDPACKET;
msg.readUInt8("flag");
}
-void ChatHandler::processChatAddMember(Net::MessageIn &msg)
+void ChatHandler::processChatRoomAddMember(Net::MessageIn &msg)
{
UNIMPLIMENTEDPACKET;
msg.readInt16("users");
msg.readString(24, "name");
}
-void ChatHandler::processChatSettings(Net::MessageIn &msg)
+void ChatHandler::processChatRoomSettings(Net::MessageIn &msg)
{
UNIMPLIMENTEDPACKET;
const int sz = msg.readInt16("len") - 17;
@@ -878,7 +878,7 @@ void ChatHandler::processChatSettings(Net::MessageIn &msg)
msg.readString(sz, "title");
}
-void ChatHandler::processChatRoleChange(Net::MessageIn &msg)
+void ChatHandler::processChatRoomRoleChange(Net::MessageIn &msg)
{
UNIMPLIMENTEDPACKET;
msg.readInt32("role");
diff --git a/src/net/eathena/chathandler.h b/src/net/eathena/chathandler.h
index 3fd70290a..879217b41 100644
--- a/src/net/eathena/chathandler.h
+++ b/src/net/eathena/chathandler.h
@@ -126,9 +126,9 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler
static void processChatDisplay(Net::MessageIn &msg);
- static void processChatJoinAck(Net::MessageIn &msg);
+ static void processChatRoomJoinAck(Net::MessageIn &msg);
- static void processChatLeave(Net::MessageIn &msg);
+ static void processChatRoomLeave(Net::MessageIn &msg);
static void processJoinChannel(Net::MessageIn &msg);
@@ -139,17 +139,17 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler
static void processIgnoreNickAck(Net::MessageIn &msg);
- static void processChatCreateAck(Net::MessageIn &msg);
+ static void processChatRoomCreateAck(Net::MessageIn &msg);
- static void processChatDestroy(Net::MessageIn &msg);
+ static void processChatRoomDestroy(Net::MessageIn &msg);
- static void processChatJoinFailed(Net::MessageIn &msg);
+ static void processChatRoomJoinFailed(Net::MessageIn &msg);
- static void processChatAddMember(Net::MessageIn &msg);
+ static void processChatRoomAddMember(Net::MessageIn &msg);
- static void processChatSettings(Net::MessageIn &msg);
+ static void processChatRoomSettings(Net::MessageIn &msg);
- static void processChatRoleChange(Net::MessageIn &msg);
+ static void processChatRoomRoleChange(Net::MessageIn &msg);
static void processMVPItem(Net::MessageIn &msg);
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index b7e767d17..62f4d1716 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -332,15 +332,15 @@
#define SMSG_SCRIPT_MESSAGE 0x08b3
#define SMSG_CHAT_IGNORE_LIST 0x00d4
-#define SMSG_CHAT_CREATE_ACK 0x00d6
+#define SMSG_CHAT_ROOM_CREATE_ACK 0x00d6
#define SMSG_CHAT_DISPLAY 0x00d7
-#define SMSG_CHAT_DESTROY 0x00d8
-#define SMSG_CHAT_JOIN_FAILED 0x00da
-#define SMSG_CHAT_JOIN_ACK 0x00db
-#define SMSG_CHAT_ADD_MEMBER 0x00dc
-#define SMSG_CHAT_LEAVE 0x00dd
-#define SMSG_CHAT_SETTINGS 0x00df
-#define SMSG_CHAT_ROLE_CHANGE 0x00e1
+#define SMSG_CHAT_ROOM_DESTROY 0x00d8
+#define SMSG_CHAT_ROOM_JOIN_FAILED 0x00da
+#define SMSG_CHAT_ROOM_JOIN_ACK 0x00db
+#define SMSG_CHAT_ROOM_ADD_MEMBER 0x00dc
+#define SMSG_CHAT_ROOM_LEAVE 0x00dd
+#define SMSG_CHAT_ROOM_SETTINGS 0x00df
+#define SMSG_CHAT_ROOM_ROLE_CHANGE 0x00e1
#define SMSG_CHAT_JOIN_CHANNEL 0x0b08
#define SMSG_CHAT_TALKIE_BOX 0x0191
@@ -504,7 +504,7 @@
#define CMSG_CHAT_MESSAGE 0x00f3
#define CMSG_CHAT_WHISPER 0x0096
#define CMSG_CHAT_WHO 0x00c1
-#define CMSG_CHAT_JOIN 0x00d9
+#define CMSG_CHAT_ROOM_JOIN 0x00d9
#define CMSG_CHAT_JOIN_CHANNEL 0x0b07
#define CMSG_CHAT_PART_CHANNEL 0x0b09
#define CMSG_BATTLE_CHAT_MESSAGE 0x02db
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-02 11:20:19 +0000