Modernize client code (#6250)

[oweals/minetest.git] / src / clientmedia.cpp

diff --git a/src/clientmedia.cpp b/src/clientmedia.cpp
index 9c1e430dfb31f02f460ffd8c75be87f059939a9b..ca6f3d563ca57911b07e380ff381bb5b244bbd03 100644 (file)
--- a/src/clientmedia.cpp
+++ b/src/clientmedia.cpp
@@ -43,17 +43,8 @@ static std::string getMediaCacheDir()
 
 ClientMediaDownloader::ClientMediaDownloader():
        m_media_cache(getMediaCacheDir()),
-       m_initial_step_done(false),
-       m_uncached_count(0),
-       m_uncached_received_count(0),
-       m_name_bound("")
+       m_httpfetch_caller(HTTPFETCH_DISCARD)
 {
-       m_httpfetch_caller = HTTPFETCH_DISCARD;
-       m_httpfetch_active = 0;
-       m_httpfetch_active_limit = 0;
-       m_httpfetch_next_id = 0;
-       m_httpfetch_timeout = 0;
-       m_outstanding_hash_sets = 0;
 }
 
 ClientMediaDownloader::~ClientMediaDownloader()
@@ -348,7 +339,7 @@ void ClientMediaDownloader::remoteMediaReceived(
 
        std::string name;
        {
-               UNORDERED_MAP<unsigned long, std::string>::iterator it =
+               std::unordered_map<unsigned long, std::string>::iterator it =
                        m_remote_file_transfers.find(fetch_result.request_id);
                assert(it != m_remote_file_transfers.end());
                name = it->second;