Illuna-Minetest
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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`
master
red-001 2017-04-26 20:10:13 +01:00 committed by Loïc Blot
parent 70ceeb80a1
commit ff1ef67dcc
4 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/client.cpp
View File

@ -526,7 +526,6 @@ void Client::step(float dtime)
if (m_media_downloader && m_media_downloader->isStarted()) { if (m_media_downloader && m_media_downloader->isStarted()) {
m_media_downloader->step(this); m_media_downloader->step(this);
if (m_media_downloader->isDone()) { if (m_media_downloader->isDone()) {
received_media();
delete m_media_downloader; delete m_media_downloader;
m_media_downloader = NULL; 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; << 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, void Client::initLocalMapSaving(const Address &address,
const std::string &hostname, const std::string &hostname,
bool is_local_server) bool is_local_server)

2
src/client.h
View File

@ -484,8 +484,6 @@ public:
bool loadMedia(const std::string &data, const std::string &filename); bool loadMedia(const std::string &data, const std::string &filename);
// Send a request for conventional media transfer // Send a request for conventional media transfer
void request_media(const std::vector<std::string> &file_requests); 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; } LocalClientState getState() { return m_state; }

3
src/network/networkprotocol.h
View File

@ -106,7 +106,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
add swap_node add swap_node
PROTOCOL_VERSION 23: PROTOCOL_VERSION 23:
Obsolete TOSERVER_RECEIVED_MEDIA Obsolete TOSERVER_RECEIVED_MEDIA
Add TOSERVER_CLIENT_READY Server: Stop using TOSERVER_CLIENT_READY
PROTOCOL_VERSION 24: PROTOCOL_VERSION 24:
ContentFeatures version 7 ContentFeatures version 7
ContentFeatures: change number of special tiles to 6 (CF_SPECIAL_COUNT) 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) with pre-30 clients by sending sqrt(visual_scale)
PROTOCOL VERSION 31: PROTOCOL VERSION 31:
Add tile overlay Add tile overlay
Stop sending TOSERVER_CLIENT_READY
*/ */
#define LATEST_PROTOCOL_VERSION 31 #define LATEST_PROTOCOL_VERSION 31

2
src/network/serveropcodes.cpp
View File

@ -89,7 +89,7 @@ const ToServerCommandHandler toServerCommandTable[TOSERVER_NUM_MSG_TYPES] =
null_command_handler, // 0x3e null_command_handler, // 0x3e
null_command_handler, // 0x3f null_command_handler, // 0x3f
{ "TOSERVER_REQUEST_MEDIA", TOSERVER_STATE_STARTUP, &Server::handleCommand_RequestMedia }, // 0x40 { "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_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 { "TOSERVER_CLIENT_READY", TOSERVER_STATE_STARTUP, &Server::handleCommand_ClientReady }, // 0x43
null_command_handler, // 0x44 null_command_handler, // 0x44