summaryrefslogtreecommitdiff
path: root/src/environment.h
diff options
context:
space:
mode:
authornerzhul <loic.blot@unix-experience.fr>2015-04-22 11:47:22 +0200
committernerzhul <loic.blot@unix-experience.fr>2015-04-22 11:47:22 +0200
commiteec01bc2fabbefbe0d0c008011592d49f8bbd18e (patch)
treed84a978ce2151adc9e090babc8de5cd5010c7d7c /src/environment.h
parent17a173f474eed3b43525d669749b4d20a5cd2ec4 (diff)
downloadminetest-eec01bc2fabbefbe0d0c008011592d49f8bbd18e.tar.gz
minetest-eec01bc2fabbefbe0d0c008011592d49f8bbd18e.tar.bz2
minetest-eec01bc2fabbefbe0d0c008011592d49f8bbd18e.zip
Re-apply 972d17baea81ffe6d508b291ef97207a4822e1da...
but not rename the container. Approved-By est31
Diffstat (limited to 'src/environment.h')
-rw-r--r--src/environment.h3
1 files changed, 2 insertions, 1 deletions
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;