diff options
| -rw-r--r-- | src/environment.cpp | 8 | ||||
| -rw-r--r-- | src/environment.h | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/environment.cpp b/src/environment.cpp index e353a16f2..8ade7fe05 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_queue.push( + m_active_object_messages.push_back( 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_queue.empty()) + if(m_active_object_messages.empty()) return ActiveObjectMessage(0); - ActiveObjectMessage message = m_active_object_messages_queue.front(); - m_active_object_messages_queue.pop(); + ActiveObjectMessage message = m_active_object_messages.front(); + m_active_object_messages.pop_front(); return message; } diff --git a/src/environment.h b/src/environment.h index e0d8d4328..415a9ec31 100644 --- a/src/environment.h +++ b/src/environment.h @@ -33,7 +33,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <set> #include <list> #include <map> -#include <queue> #include "irr_v3d.h" #include "activeobject.h" #include "util/numeric.h" @@ -379,7 +378,7 @@ private: // Active object list std::map<u16, ServerActiveObject*> m_active_objects; // Outgoing network message buffer for active objects - std::queue<ActiveObjectMessage> m_active_object_messages_queue; + std::list<ActiveObjectMessage> m_active_object_messages; // Some timers float m_send_recommended_timer; IntervalLimiter m_object_management_interval; |