diff options
| author | sapier <Sapier at GMX dot net> | 2014-01-31 00:24:00 +0100 |
|---|---|---|
| committer | sapier <Sapier at GMX dot net> | 2014-01-31 18:44:43 +0100 |
| commit | e258675eabc874d31bc9c6cf49e4bbc1f7f3f417 (patch) | |
| tree | 2d9dfd872c8b88db13cfdeaa0503b3d88545d179 /src/clientmedia.cpp | |
| parent | 21f1bec72433748e220d19e97a846df83340518e (diff) | |
| download | minetest-e258675eabc874d31bc9c6cf49e4bbc1f7f3f417.tar.gz minetest-e258675eabc874d31bc9c6cf49e4bbc1f7f3f417.tar.bz2 minetest-e258675eabc874d31bc9c6cf49e4bbc1f7f3f417.zip | |
Add propper client initialization
-add client states to avoid server sending data to uninitialized clients
-don't show uninitialized clients to other players
-propper client disconnect handling
Minor comment fixes in server
Minor bugfixes in connection
-improved peer id calculation
-honor NDEBUG flag
-improved disconnect handling
-increased initial send window
Remove some dead code
Diffstat (limited to 'src/clientmedia.cpp')
| -rw-r--r-- | src/clientmedia.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/clientmedia.cpp b/src/clientmedia.cpp index 8260d5f5a..dcae44023 100644 --- a/src/clientmedia.cpp +++ b/src/clientmedia.cpp @@ -480,13 +480,7 @@ void ClientMediaDownloader::startConventionalTransfers(Client *client) { assert(m_httpfetch_active == 0); - if (m_uncached_received_count == m_uncached_count) { - // In this case all media was found in the cache or - // has been downloaded from some remote server; - // report this fact to the server - client->received_media(); - } - else { + if (m_uncached_received_count != m_uncached_count) { // Some media files have not been received yet, use the // conventional slow method (minetest protocol) to get them std::list<std::string> file_requests; |