diff options
| author | Ilya Zhuravlev <zhuravlevilya@ya.ru> | 2012-12-14 15:30:17 +0400 |
|---|---|---|
| committer | Ilya Zhuravlev <zhuravlevilya@ya.ru> | 2012-12-16 15:20:18 +0400 |
| commit | 3578e1d4a711a32e2e768dcc6ff207ffc1bccbad (patch) | |
| tree | 9215740fb64bbb89ce9b9ba89f8ebf0db709ee35 /src/server.cpp | |
| parent | aa46e5c5e7285a8ac5c9e096a55c3fa02b90280e (diff) | |
| download | minetest-3578e1d4a711a32e2e768dcc6ff207ffc1bccbad.tar.gz minetest-3578e1d4a711a32e2e768dcc6ff207ffc1bccbad.tar.bz2 minetest-3578e1d4a711a32e2e768dcc6ff207ffc1bccbad.zip | |
Added ability to fetch media from remote server (using cURL library)
Diffstat (limited to 'src/server.cpp')
| -rw-r--r-- | src/server.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/server.cpp b/src/server.cpp index 2449f4236..4b43a3205 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2885,6 +2885,9 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) // (definitions and files) getClient(peer_id)->definitions_sent = true; } + else if(command == TOSERVER_RECEIVED_MEDIA) { + getClient(peer_id)->definitions_sent = true; + } else if(command == TOSERVER_INTERACT) { std::string datastring((char*)&data[2], datasize-2); @@ -4217,6 +4220,7 @@ void Server::sendMediaAnnouncement(u16 peer_id) os<<serializeString(j->name); os<<serializeString(j->sha1_digest); } + os<<serializeString(g_settings->get("remote_media")); // Make data buffer std::string s = os.str(); @@ -4224,7 +4228,6 @@ void Server::sendMediaAnnouncement(u16 peer_id) // Send as reliable m_con.Send(peer_id, 0, data, true); - } struct SendableMedia |