diff options
| author | nerzhul <loic.blot@unix-experience.fr> | 2015-04-22 11:47:22 +0200 |
|---|---|---|
| committer | nerzhul <loic.blot@unix-experience.fr> | 2015-04-22 11:47:22 +0200 |
| commit | eec01bc2fabbefbe0d0c008011592d49f8bbd18e (patch) | |
| tree | d84a978ce2151adc9e090babc8de5cd5010c7d7c | |
| parent | 17a173f474eed3b43525d669749b4d20a5cd2ec4 (diff) | |
| download | minetest-eec01bc2fabbefbe0d0c008011592d49f8bbd18e.tar.gz minetest-eec01bc2fabbefbe0d0c008011592d49f8bbd18e.tar.bz2 minetest-eec01bc2fabbefbe0d0c008011592d49f8bbd18e.zip | |
Re-apply 972d17baea81ffe6d508b291ef97207a4822e1da...
but not rename the container. Approved-By est31
| -rw-r--r-- | src/environment.cpp | 4 | ||||
| -rw-r--r-- | src/environment.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/environment.cpp b/src/environment.cpp index 8ade7fe05..96353dffb 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.push( obj->m_messages_out.front()); obj->m_messages_out.pop(); } @@ -1462,7 +1462,7 @@ ActiveObjectMessage ServerEnvironment::getActiveObjectMessage() return ActiveObjectMessage(0); ActiveObjectMessage message = m_active_object_messages.front(); - m_active_object_messages.pop_front(); + m_active_object_messages.pop(); return message; } diff --git a/src/environment.h b/src/environment.h index 415a9ec31..a25a12db3 100644 --- a/src/environment.h +++ b/src/environment.h @@ -32,6 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <set> #include <list> +#include <queue> #include <map> #include "irr_v3d.h" #include "activeobject.h" @@ -378,7 +379,7 @@ private: // Active object list std::map<u16, ServerActiveObject*> m_active_objects; // Outgoing network message buffer for active objects - std::list<ActiveObjectMessage> m_active_object_messages; + std::queue<ActiveObjectMessage> m_active_object_messages; // Some timers float m_send_recommended_timer; IntervalLimiter m_object_management_interval; |