From 6a1670dbc31cc0e44178bbd9ad34ff0d5981a060 Mon Sep 17 00:00:00 2001 From: Ilya Zhuravlev Date: Thu, 20 Dec 2012 21:19:49 +0400 Subject: Migrate to STL containers/algorithms. --- src/client.cpp | 102 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 50 insertions(+), 52 deletions(-) (limited to 'src/client.cpp') diff --git a/src/client.cpp b/src/client.cpp index be35db5de..2ccace842 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -232,8 +232,8 @@ void * MediaFetchThread::Thread() #if USE_CURL CURL *curl; CURLcode res; - for (core::list::Iterator i = m_file_requests.begin(); - i != m_file_requests.end(); i++) { + for (std::list::iterator i = m_file_requests.begin(); + i != m_file_requests.end(); ++i) { curl = curl_easy_init(); assert(curl); curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); @@ -360,8 +360,8 @@ Client::~Client() } } - for (core::list::Iterator i = m_media_fetch_threads.begin(); - i != m_media_fetch_threads.end(); i++) + for (std::list::iterator i = m_media_fetch_threads.begin(); + i != m_media_fetch_threads.end(); ++i) delete *i; } @@ -585,7 +585,7 @@ void Client::step(float dtime) if(m_map_timer_and_unload_interval.step(dtime, map_timer_and_unload_dtime)) { ScopeProfiler sp(g_profiler, "Client: map timer and unload"); - core::list deleted_blocks; + std::list deleted_blocks; m_env.getMap().timerUpdate(map_timer_and_unload_dtime, g_settings->getFloat("client_unload_unused_data_timeout"), &deleted_blocks); @@ -599,8 +599,8 @@ void Client::step(float dtime) NOTE: This loop is intentionally iterated the way it is. */ - core::list::Iterator i = deleted_blocks.begin(); - core::list sendlist; + std::list::iterator i = deleted_blocks.begin(); + std::list sendlist; for(;;) { if(sendlist.size() == 255 || i == deleted_blocks.end()) @@ -619,9 +619,9 @@ void Client::step(float dtime) writeU16(&reply[0], TOSERVER_DELETEDBLOCKS); reply[2] = sendlist.size(); u32 k = 0; - for(core::list::Iterator + for(std::list::iterator j = sendlist.begin(); - j != sendlist.end(); j++) + j != sendlist.end(); ++j) { writeV3S16(&reply[2+1+6*k], *j); k++; @@ -635,7 +635,7 @@ void Client::step(float dtime) } sendlist.push_back(*i); - i++; + ++i; } } @@ -727,7 +727,7 @@ void Client::step(float dtime) < 0) + while(!m_mesh_update_thread.m_queue_out.empty()) { num_processed_meshes++; MeshUpdateResult r = m_mesh_update_thread.m_queue_out.pop_front(); @@ -779,10 +779,10 @@ void Client::step(float dtime) */ if (m_media_receive_started) { bool all_stopped = true; - for (core::list::Iterator thread = m_media_fetch_threads.begin(); - thread != m_media_fetch_threads.end(); thread++) { + for (std::list::iterator thread = m_media_fetch_threads.begin(); + thread != m_media_fetch_threads.end(); ++thread) { all_stopped &= !(*thread)->IsRunning(); - while ((*thread)->m_file_data.size() > 0) { + while (!(*thread)->m_file_data.empty()) { std::pair out = (*thread)->m_file_data.pop_front(); ++m_media_received_count; @@ -803,9 +803,9 @@ void Client::step(float dtime) } { - core::map::Node *n; + std::map::iterator n; n = m_media_name_sha1_map.find(out.first); - if(n == NULL) + if(n == m_media_name_sha1_map.end()) errorstream<<"The server sent a file that has not " <<"been announced."< fetch_failed; - for (core::list::Iterator thread = m_media_fetch_threads.begin(); - thread != m_media_fetch_threads.end(); thread++) { - for (core::list::Iterator request = (*thread)->m_failed.begin(); - request != (*thread)->m_failed.end(); request++) + std::list fetch_failed; + for (std::list::iterator thread = m_media_fetch_threads.begin(); + thread != m_media_fetch_threads.end(); ++thread) { + for (std::list::iterator request = (*thread)->m_failed.begin(); + request != (*thread)->m_failed.end(); ++request) fetch_failed.push_back(*request); (*thread)->m_failed.clear(); } @@ -1015,14 +1015,14 @@ void Client::deletingPeer(con::Peer *peer, bool timeout) string name } */ -void Client::request_media(const core::list &file_requests) +void Client::request_media(const std::list &file_requests) { std::ostringstream os(std::ios_base::binary); writeU16(os, TOSERVER_REQUEST_MEDIA); writeU16(os, file_requests.size()); - for(core::list::ConstIterator i = file_requests.begin(); - i != file_requests.end(); i++) { + for(std::list::const_iterator i = file_requests.begin(); + i != file_requests.end(); ++i) { os<name); } @@ -1622,7 +1622,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) infostream<<"Client: Received media announcement: packet size: " < file_requests; + std::list file_requests; for(int i=0; i::Iterator cur = m_media_fetch_threads.begin(); - for(core::list::Iterator i = file_requests.begin(); - i != file_requests.end(); i++) { + std::list::iterator cur = m_media_fetch_threads.begin(); + for(std::list::iterator i = file_requests.begin(); + i != file_requests.end(); ++i) { (*cur)->m_file_requests.push_back(*i); cur++; if (cur == m_media_fetch_threads.end()) cur = m_media_fetch_threads.begin(); } - for (core::list::Iterator i = m_media_fetch_threads.begin(); - i != m_media_fetch_threads.end(); i++) { + for (std::list::iterator i = m_media_fetch_threads.begin(); + i != m_media_fetch_threads.end(); ++i) { (*i)->m_remote_url = remote_media; (*i)->Start(); } @@ -1762,9 +1762,9 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) } { - core::map::Node *n; + std::map::iterator n; n = m_media_name_sha1_map.find(name); - if(n == NULL) + if(n == m_media_name_sha1_map.end()) errorstream<<"The server sent a file that has not " <<"been announced."< modified_blocks; + std::map modified_blocks; try { @@ -2245,12 +2245,11 @@ void Client::removeNode(v3s16 p) // add urgent task to update the modified node addUpdateMeshTaskForNode(p, false, true); - for(core::map::Iterator - i = modified_blocks.getIterator(); - i.atEnd() == false; i++) + for(std::map::iterator + i = modified_blocks.begin(); + i != modified_blocks.end(); ++i) { - v3s16 p = i.getNode()->getKey(); - addUpdateMeshTaskWithEdge(p); + addUpdateMeshTaskWithEdge(i->first); } } @@ -2258,7 +2257,7 @@ void Client::addNode(v3s16 p, MapNode n) { TimeTaker timer1("Client::addNode()"); - core::map modified_blocks; + std::map modified_blocks; try { @@ -2268,12 +2267,11 @@ void Client::addNode(v3s16 p, MapNode n) catch(InvalidPositionException &e) {} - for(core::map::Iterator - i = modified_blocks.getIterator(); - i.atEnd() == false; i++) + for(std::map::iterator + i = modified_blocks.begin(); + i != modified_blocks.end(); ++i) { - v3s16 p = i.getNode()->getKey(); - addUpdateMeshTaskWithEdge(p); + addUpdateMeshTaskWithEdge(i->first); } } @@ -2373,7 +2371,7 @@ ClientActiveObject * Client::getSelectedActiveObject( core::line3d shootline_on_map ) { - core::array objects; + std::vector objects; m_env.getActiveObjects(from_pos_f_on_map, max_d, objects); @@ -2381,7 +2379,7 @@ ClientActiveObject * Client::getSelectedActiveObject( // Sort them. // After this, the closest object is the first in the array. - objects.sort(); + std::sort(objects.begin(), objects.end()); for(u32 i=0; i Client::getConnectedPlayerNames() +std::list Client::getConnectedPlayerNames() { - core::list players = m_env.getPlayers(true); - core::list playerNames; - for(core::list::Iterator + std::list players = m_env.getPlayers(true); + std::list playerNames; + for(std::list::iterator i = players.begin(); - i != players.end(); i++) + i != players.end(); ++i) { Player *player = *i; playerNames.push_back(narrow_to_wide(player->getName())); -- cgit v1.2.3