diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2015-04-21 23:26:34 +0200 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2015-04-21 23:28:13 +0200 |
| commit | 972d17baea81ffe6d508b291ef97207a4822e1da (patch) | |
| tree | a764693c186e29212f4357a9802958685c5b5767 /src/environment.cpp | |
| parent | 436cb468e9a832d15009d527d80c8dfe86bb2772 (diff) | |
| download | minetest-972d17baea81ffe6d508b291ef97207a4822e1da.tar.gz minetest-972d17baea81ffe6d508b291ef97207a4822e1da.tar.bz2 minetest-972d17baea81ffe6d508b291ef97207a4822e1da.zip | |
m_active_object_messages is used like a queue. Use std::queue instead of std::list. Also rename to m_active_object_messages_queue
Diffstat (limited to 'src/environment.cpp')
| -rw-r--r-- | src/environment.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/environment.cpp b/src/environment.cpp index 8ade7fe05..e353a16f2 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -1238,7 +1238,7 @@ void ServerEnvironment::step(float dtime) // Read messages from object while(!obj->m_messages_out.empty()) { - m_active_object_messages.push_back( + m_active_object_messages_queue.push( obj->m_messages_out.front()); obj->m_messages_out.pop(); } @@ -1458,11 +1458,11 @@ void ServerEnvironment::getRemovedActiveObjects(v3s16 pos, s16 radius, ActiveObjectMessage ServerEnvironment::getActiveObjectMessage() { - if(m_active_object_messages.empty()) + if(m_active_object_messages_queue.empty()) return ActiveObjectMessage(0); - ActiveObjectMessage message = m_active_object_messages.front(); - m_active_object_messages.pop_front(); + ActiveObjectMessage message = m_active_object_messages_queue.front(); + m_active_object_messages_queue.pop(); return message; } |