Skip to content

Commit ae6aed1

Browse files
red-001nerzhul
authored andcommitted
Remove legacy chat network code. (#6954)
1 parent 11928b7 commit ae6aed1

File tree

3 files changed

+1
-26
lines changed

3 files changed

+1
-26
lines changed

src/client.h

-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
188188
void handleCommand_BlockData(NetworkPacket* pkt);
189189
void handleCommand_Inventory(NetworkPacket* pkt);
190190
void handleCommand_TimeOfDay(NetworkPacket* pkt);
191-
void handleCommand_ChatMessageOld(NetworkPacket *pkt);
192191
void handleCommand_ChatMessage(NetworkPacket *pkt);
193192
void handleCommand_ActiveObjectRemoveAdd(NetworkPacket* pkt);
194193
void handleCommand_ActiveObjectMessages(NetworkPacket* pkt);

src/network/clientopcodes.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ const ToClientCommandHandler toClientCommandTable[TOCLIENT_NUM_MSG_TYPES] =
7272
null_command_handler,
7373
null_command_handler,
7474
{ "TOCLIENT_CHAT_MESSAGE", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_ChatMessage }, // 0x2F
75-
{ "TOCLIENT_CHAT_MESSAGE_OLD", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_ChatMessageOld }, // 0x30
75+
null_command_handler, // 0x30
7676
{ "TOCLIENT_ACTIVE_OBJECT_REMOVE_ADD", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_ActiveObjectRemoveAdd }, // 0x31
7777
{ "TOCLIENT_ACTIVE_OBJECT_MESSAGES", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_ActiveObjectMessages }, // 0x32
7878
{ "TOCLIENT_HP", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_HP }, // 0x33

src/network/clientpackethandler.cpp

-24
Original file line numberDiff line numberDiff line change
@@ -358,30 +358,6 @@ void Client::handleCommand_TimeOfDay(NetworkPacket* pkt)
358358
<< " dr=" << dr << std::endl;
359359
}
360360

361-
void Client::handleCommand_ChatMessageOld(NetworkPacket *pkt)
362-
{
363-
/*
364-
u16 command
365-
u16 length
366-
wstring message
367-
*/
368-
u16 len, read_wchar;
369-
370-
*pkt >> len;
371-
372-
std::wstring message;
373-
for (u32 i = 0; i < len; i++) {
374-
*pkt >> read_wchar;
375-
message += (wchar_t)read_wchar;
376-
}
377-
378-
// If chat message not consummed by client lua API
379-
// @TODO send this to CSM using ChatMessage object
380-
if (!moddingEnabled() || !m_script->on_receiving_message(wide_to_utf8(message))) {
381-
pushToChatQueue(new ChatMessage(message));
382-
}
383-
}
384-
385361
void Client::handleCommand_ChatMessage(NetworkPacket *pkt)
386362
{
387363
/*

0 commit comments

Comments
 (0)