Remove legacy chat network code. (#6954)

diff --git a/src/client.h b/src/client.h
index 10158dc5ca91913bd0d0571688c03d4fa437d18f..8b8923f29a56cb6bd5eb5461ae61b0aa4ac40a65 100644 (file)
--- a/src/client.h
+++ b/src/client.h
@@ -188,7 +188,6 @@ public:
        void handleCommand_BlockData(NetworkPacket* pkt);
        void handleCommand_Inventory(NetworkPacket* pkt);
        void handleCommand_TimeOfDay(NetworkPacket* pkt);
-       void handleCommand_ChatMessageOld(NetworkPacket *pkt);
        void handleCommand_ChatMessage(NetworkPacket *pkt);
        void handleCommand_ActiveObjectRemoveAdd(NetworkPacket* pkt);
        void handleCommand_ActiveObjectMessages(NetworkPacket* pkt);

diff --git a/src/network/clientopcodes.cpp b/src/network/clientopcodes.cpp
index bc5bd37dddfd91f550341e4d4c58eecb65a66be3..929827529925b02f204a63da7282e4dab9d9efec 100644 (file)
--- a/src/network/clientopcodes.cpp
+++ b/src/network/clientopcodes.cpp
@@ -72,7 +72,7 @@ const ToClientCommandHandler toClientCommandTable[TOCLIENT_NUM_MSG_TYPES] =
        null_command_handler,
        null_command_handler,
        { "TOCLIENT_CHAT_MESSAGE",             TOCLIENT_STATE_CONNECTED, &Client::handleCommand_ChatMessage }, // 0x2F
-       { "TOCLIENT_CHAT_MESSAGE_OLD",         TOCLIENT_STATE_CONNECTED, &Client::handleCommand_ChatMessageOld }, // 0x30
+       null_command_handler, // 0x30
        { "TOCLIENT_ACTIVE_OBJECT_REMOVE_ADD", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_ActiveObjectRemoveAdd }, // 0x31
        { "TOCLIENT_ACTIVE_OBJECT_MESSAGES",   TOCLIENT_STATE_CONNECTED, &Client::handleCommand_ActiveObjectMessages }, // 0x32
        { "TOCLIENT_HP",                       TOCLIENT_STATE_CONNECTED, &Client::handleCommand_HP }, // 0x33

diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index aa4d8c244960dd69ede7653452f08a95721c4040..07a38e397d918a3bd8cc306e453b305fa8828da0 100644 (file)
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.cpp
@@ -358,30 +358,6 @@ void Client::handleCommand_TimeOfDay(NetworkPacket* pkt)
                        << " dr=" << dr << std::endl;
 }
 
-void Client::handleCommand_ChatMessageOld(NetworkPacket *pkt)
-{
-       /*
-               u16 command
-               u16 length
-               wstring message
-       */
-       u16 len, read_wchar;
-
-       *pkt >> len;
-
-       std::wstring message;
-       for (u32 i = 0; i < len; i++) {
-               *pkt >> read_wchar;
-               message += (wchar_t)read_wchar;
-       }
-
-       // If chat message not consummed by client lua API
-       // @TODO send this to CSM using ChatMessage object
-       if (!moddingEnabled() || !m_script->on_receiving_message(wide_to_utf8(message))) {
-               pushToChatQueue(new ChatMessage(message));
-       }
-}
-
 void Client::handleCommand_ChatMessage(NetworkPacket *pkt)
 {
        /*