Skip to content

Commit 0c34fe2

Browse files
red-001nerzhul
red-001
authored and
nerzhul
committedApr 22, 2017
Network:Remove old opcodes and fix documentation. (#5573)
·
5.11.00.4.16
1 parent 4c03190 commit 0c34fe2

7 files changed

+7
-28
lines changed
 

Diff for: ‎src/client.h

-3
Original file line numberDiff line numberDiff line change
@@ -311,13 +311,10 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
311311
void handleCommand_HP(NetworkPacket* pkt);
312312
void handleCommand_Breath(NetworkPacket* pkt);
313313
void handleCommand_MovePlayer(NetworkPacket* pkt);
314-
void handleCommand_PlayerItem(NetworkPacket* pkt);
315314
void handleCommand_DeathScreen(NetworkPacket* pkt);
316315
void handleCommand_AnnounceMedia(NetworkPacket* pkt);
317316
void handleCommand_Media(NetworkPacket* pkt);
318-
void handleCommand_ToolDef(NetworkPacket* pkt);
319317
void handleCommand_NodeDef(NetworkPacket* pkt);
320-
void handleCommand_CraftItemDef(NetworkPacket* pkt);
321318
void handleCommand_ItemDef(NetworkPacket* pkt);
322319
void handleCommand_PlaySound(NetworkPacket* pkt);
323320
void handleCommand_StopSound(NetworkPacket* pkt);

Diff for: ‎src/network/clientopcodes.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ const ToClientCommandHandler toClientCommandTable[TOCLIENT_NUM_MSG_TYPES] =
7878
{ "TOCLIENT_HP", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_HP }, // 0x33
7979
{ "TOCLIENT_MOVE_PLAYER", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_MovePlayer }, // 0x34
8080
{ "TOCLIENT_ACCESS_DENIED_LEGACY", TOCLIENT_STATE_NOT_CONNECTED, &Client::handleCommand_AccessDenied }, // 0x35
81-
{ "TOCLIENT_PLAYERITEM", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_PlayerItem }, // 0x36
81+
null_command_handler,
8282
{ "TOCLIENT_DEATHSCREEN", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_DeathScreen }, // 0x37
8383
{ "TOCLIENT_MEDIA", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_Media }, // 0x38
84-
{ "TOCLIENT_TOOLDEF", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_ToolDef }, // 0x39
84+
null_command_handler,
8585
{ "TOCLIENT_NODEDEF", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_NodeDef }, // 0x3a
86-
{ "TOCLIENT_CRAFTITEMDEF", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_CraftItemDef }, // 0x3b
86+
null_command_handler,
8787
{ "TOCLIENT_ANNOUNCE_MEDIA", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_AnnounceMedia }, // 0x3c
8888
{ "TOCLIENT_ITEMDEF", TOCLIENT_STATE_CONNECTED, &Client::handleCommand_ItemDef }, // 0x3d
8989
null_command_handler,

Diff for: ‎src/network/clientpackethandler.cpp

-15
Original file line numberDiff line numberDiff line change
@@ -587,11 +587,6 @@ void Client::handleCommand_MovePlayer(NetworkPacket* pkt)
587587
m_ignore_damage_timer = 3.0;
588588
}
589589

590-
void Client::handleCommand_PlayerItem(NetworkPacket* pkt)
591-
{
592-
warningstream << "Client: Ignoring TOCLIENT_PLAYERITEM" << std::endl;
593-
}
594-
595590
void Client::handleCommand_DeathScreen(NetworkPacket* pkt)
596591
{
597592
bool set_camera_point_target;
@@ -718,11 +713,6 @@ void Client::handleCommand_Media(NetworkPacket* pkt)
718713
}
719714
}
720715

721-
void Client::handleCommand_ToolDef(NetworkPacket* pkt)
722-
{
723-
warningstream << "Client: Ignoring TOCLIENT_TOOLDEF" << std::endl;
724-
}
725-
726716
void Client::handleCommand_NodeDef(NetworkPacket* pkt)
727717
{
728718
infostream << "Client: Received node definitions: packet size: "
@@ -743,11 +733,6 @@ void Client::handleCommand_NodeDef(NetworkPacket* pkt)
743733
m_nodedef_received = true;
744734
}
745735

746-
void Client::handleCommand_CraftItemDef(NetworkPacket* pkt)
747-
{
748-
warningstream << "Client: Ignoring TOCLIENT_CRAFTITEMDEF" << std::endl;
749-
}
750-
751736
void Client::handleCommand_ItemDef(NetworkPacket* pkt)
752737
{
753738
infostream << "Client: Received item definitions: packet size: "

Diff for: ‎src/network/networkprotocol.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
5050
ContentFeatures and NodeDefManager use a different serialization
5151
format; better for future version cross-compatibility
5252
Many things
53+
Obsolete TOCLIENT_PLAYERITEM
5354
PROTOCOL_VERSION 10:
5455
TOCLIENT_PRIVILEGES
5556
Version raised to force 'fly' and 'fast' privileges into effect.
@@ -104,7 +105,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
104105
PROTOCOL_VERSION 22:
105106
add swap_node
106107
PROTOCOL_VERSION 23:
107-
TOSERVER_CLIENT_READY
108+
Obsolete TOSERVER_RECEIVED_MEDIA
109+
Add TOSERVER_CLIENT_READY
108110
PROTOCOL_VERSION 24:
109111
ContentFeatures version 7
110112
ContentFeatures: change number of special tiles to 6 (CF_SPECIAL_COUNT)

Diff for: ‎src/network/serveropcodes.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ const ToServerCommandHandler toServerCommandTable[TOSERVER_NUM_MSG_TYPES] =
8989
null_command_handler, // 0x3e
9090
null_command_handler, // 0x3f
9191
{ "TOSERVER_REQUEST_MEDIA", TOSERVER_STATE_STARTUP, &Server::handleCommand_RequestMedia }, // 0x40
92-
{ "TOSERVER_RECEIVED_MEDIA", TOSERVER_STATE_STARTUP, &Server::handleCommand_ReceivedMedia }, // 0x41
92+
null_command_handler, // 0x41
9393
{ "TOSERVER_BREATH", TOSERVER_STATE_INGAME, &Server::handleCommand_Deprecated }, // 0x42 Old breath model which is now deprecated for anticheating
9494
{ "TOSERVER_CLIENT_READY", TOSERVER_STATE_STARTUP, &Server::handleCommand_ClientReady }, // 0x43
9595
null_command_handler, // 0x44

Diff for: ‎src/network/serverpackethandler.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -674,10 +674,6 @@ void Server::handleCommand_RequestMedia(NetworkPacket* pkt)
674674
sendRequestedMedia(pkt->getPeerId(), tosend);
675675
}
676676

677-
void Server::handleCommand_ReceivedMedia(NetworkPacket* pkt)
678-
{
679-
}
680-
681677
void Server::handleCommand_ClientReady(NetworkPacket* pkt)
682678
{
683679
u16 peer_id = pkt->getPeerId();

Diff for: ‎src/server.h

-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ class Server : public con::PeerHandler, public MapEventReceiver,
174174
void handleCommand_Init_Legacy(NetworkPacket* pkt);
175175
void handleCommand_Init2(NetworkPacket* pkt);
176176
void handleCommand_RequestMedia(NetworkPacket* pkt);
177-
void handleCommand_ReceivedMedia(NetworkPacket* pkt);
178177
void handleCommand_ClientReady(NetworkPacket* pkt);
179178
void handleCommand_GotBlocks(NetworkPacket* pkt);
180179
void handleCommand_PlayerPos(NetworkPacket* pkt);

0 commit comments

Comments
 (0)
Please sign in to comment.