summaryrefslogtreecommitdiff
path: root/src/client.cpp
diff options
context:
space:
mode:
authorLoic Blot <loic.blot@unix-experience.fr>2015-02-17 15:04:08 +0100
committerLoic Blot <loic.blot@unix-experience.fr>2015-02-17 15:08:37 +0100
commit3c91ad8fc2b7a7888503e85d31bfe286afa6560d (patch)
tree3003e3fe5a9617651dc512f828ac7cbc3d5d155b /src/client.cpp
parent24315db6ef90125c3c62327f2ace654b548811ac (diff)
downloadminetest-3c91ad8fc2b7a7888503e85d31bfe286afa6560d.tar.gz
minetest-3c91ad8fc2b7a7888503e85d31bfe286afa6560d.tar.bz2
minetest-3c91ad8fc2b7a7888503e85d31bfe286afa6560d.zip
Replace std::list by std::vector into timerUpdate calls
Diffstat (limited to 'src/client.cpp')
-rw-r--r--src/client.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 38ce54bdc..17661d0c1 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -434,7 +434,7 @@ void Client::step(float dtime)
const float map_timer_and_unload_dtime = 5.25;
if(m_map_timer_and_unload_interval.step(dtime, map_timer_and_unload_dtime)) {
ScopeProfiler sp(g_profiler, "Client: map timer and unload");
- std::list<v3s16> deleted_blocks;
+ std::vector<v3s16> deleted_blocks;
m_env.getMap().timerUpdate(map_timer_and_unload_dtime,
g_settings->getFloat("client_unload_unused_data_timeout"),
&deleted_blocks);
@@ -444,8 +444,8 @@ void Client::step(float dtime)
NOTE: This loop is intentionally iterated the way it is.
*/
- std::list<v3s16>::iterator i = deleted_blocks.begin();
- std::list<v3s16> sendlist;
+ std::vector<v3s16>::iterator i = deleted_blocks.begin();
+ std::vector<v3s16> sendlist;
for(;;) {
if(sendlist.size() == 255 || i == deleted_blocks.end()) {
if(sendlist.empty())
@@ -462,7 +462,7 @@ void Client::step(float dtime)
*pkt << (u8) sendlist.size();
u32 k = 0;
- for(std::list<v3s16>::iterator
+ for(std::vector<v3s16>::iterator
j = sendlist.begin();
j != sendlist.end(); ++j) {
*pkt << *j;