diff options
| author | red-001 <red-001@outlook.ie> | 2017-04-26 20:10:13 +0100 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-04-26 21:10:13 +0200 |
| commit | ff1ef67dccefb8d283142ea86db250f07aee095c (patch) | |
| tree | 563f89059b9a71f31073fcfc450e591f3f2f11cd | |
| parent | 70ceeb80a180507e38db957f217e2c78ce901692 (diff) | |
| download | minetest-ff1ef67dccefb8d283142ea86db250f07aee095c.tar.gz minetest-ff1ef67dccefb8d283142ea86db250f07aee095c.tar.bz2 minetest-ff1ef67dccefb8d283142ea86db250f07aee095c.zip | |
Fix #5655 (#5658)
Client: Don't send `TOSERVER_RECEIVED_MEDIA` since it's not used anymore
Server: Handle `TOSERVER_RECEIVED_MEDIA` using `Server::handleCommand_Deprecated`
| -rw-r--r-- | src/client.cpp | 9 | ||||
| -rw-r--r-- | src/client.h | 2 | ||||
| -rw-r--r-- | src/network/networkprotocol.h | 3 | ||||
| -rw-r--r-- | src/network/serveropcodes.cpp | 2 |
4 files changed, 3 insertions, 13 deletions
diff --git a/src/client.cpp b/src/client.cpp index 19fe9b0ba..019693f1d 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -526,7 +526,6 @@ void Client::step(float dtime) if (m_media_downloader && m_media_downloader->isStarted()) { m_media_downloader->step(this); if (m_media_downloader->isDone()) { - received_media(); delete m_media_downloader; m_media_downloader = NULL; } @@ -747,14 +746,6 @@ void Client::request_media(const std::vector<std::string> &file_requests) << file_requests.size() << " files. packet size)" << std::endl; } -void Client::received_media() -{ - NetworkPacket pkt(TOSERVER_RECEIVED_MEDIA, 0); - Send(&pkt); - infostream << "Client: Notifying server that we received all media" - << std::endl; -} - void Client::initLocalMapSaving(const Address &address, const std::string &hostname, bool is_local_server) diff --git a/src/client.h b/src/client.h index 328a24f90..68953d402 100644 --- a/src/client.h +++ b/src/client.h @@ -484,8 +484,6 @@ public: bool loadMedia(const std::string &data, const std::string &filename); // Send a request for conventional media transfer void request_media(const std::vector<std::string> &file_requests); - // Send a notification that no conventional media transfer is needed - void received_media(); LocalClientState getState() { return m_state; } diff --git a/src/network/networkprotocol.h b/src/network/networkprotocol.h index cf60b3a10..e7a3469b7 100644 --- a/src/network/networkprotocol.h +++ b/src/network/networkprotocol.h @@ -106,7 +106,7 @@ with this program; if not, write to the Free Software Foundation, Inc., add swap_node PROTOCOL_VERSION 23: Obsolete TOSERVER_RECEIVED_MEDIA - Add TOSERVER_CLIENT_READY + Server: Stop using TOSERVER_CLIENT_READY PROTOCOL_VERSION 24: ContentFeatures version 7 ContentFeatures: change number of special tiles to 6 (CF_SPECIAL_COUNT) @@ -152,6 +152,7 @@ with this program; if not, write to the Free Software Foundation, Inc., with pre-30 clients by sending sqrt(visual_scale) PROTOCOL VERSION 31: Add tile overlay + Stop sending TOSERVER_CLIENT_READY */ #define LATEST_PROTOCOL_VERSION 31 diff --git a/src/network/serveropcodes.cpp b/src/network/serveropcodes.cpp index 7133259e0..31b571ff0 100644 --- a/src/network/serveropcodes.cpp +++ b/src/network/serveropcodes.cpp @@ -89,7 +89,7 @@ const ToServerCommandHandler toServerCommandTable[TOSERVER_NUM_MSG_TYPES] = null_command_handler, // 0x3e null_command_handler, // 0x3f { "TOSERVER_REQUEST_MEDIA", TOSERVER_STATE_STARTUP, &Server::handleCommand_RequestMedia }, // 0x40 - null_command_handler, // 0x41 + { "TOSERVER_RECEIVED_MEDIA", TOSERVER_STATE_STARTUP, &Server::handleCommand_Deprecated }, // 0x41 not used by the server since protocol version 23 { "TOSERVER_BREATH", TOSERVER_STATE_INGAME, &Server::handleCommand_Deprecated }, // 0x42 Old breath model which is now deprecated for anticheating { "TOSERVER_CLIENT_READY", TOSERVER_STATE_STARTUP, &Server::handleCommand_ClientReady }, // 0x43 null_command_handler, // 0x44 |