m_active_object_messages is used like a queue. Use std::queue instead of std::list. Also rename to m_active_object_messages_queue

nerzhul · nerzhul · commit 972d17baea81 · 2015-04-21T23:28:13.000+02:00
diff --git 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;
 }
 
diff --git a/src/environment.h b/src/environment.h
@@ -33,6 +33,7 @@ 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"
@@ -378,7 +379,7 @@ class ServerEnvironment : public Environment
 	// 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_queue;
 	// Some timers
 	float m_send_recommended_timer;
 	IntervalLimiter m_object_management_interval;

Original file line number	Diff line number	Diff line change
`@@ -1238,7 +1238,7 @@ void ServerEnvironment::step(float dtime)`
`1238`	`1238`	`// Read messages from object`
`1239`	`1239`	`while(!obj->m_messages_out.empty())`
`1240`	`1240`	`{`
`1241`		`- m_active_object_messages.push_back(`
	`1241`	`+ m_active_object_messages_queue.push(`
`1242`	`1242`	`obj->m_messages_out.front());`
`1243`	`1243`	`obj->m_messages_out.pop();`
`1244`	`1244`	`}`
`@@ -1458,11 +1458,11 @@ void ServerEnvironment::getRemovedActiveObjects(v3s16 pos, s16 radius,`
`1458`	`1458`
`1459`	`1459`	`ActiveObjectMessage ServerEnvironment::getActiveObjectMessage()`
`1460`	`1460`	`{`
`1461`		`- if(m_active_object_messages.empty())`
	`1461`	`+ if(m_active_object_messages_queue.empty())`
`1462`	`1462`	`return ActiveObjectMessage(0);`
`1463`	`1463`
`1464`		`- ActiveObjectMessage message = m_active_object_messages.front();`
`1465`		`- m_active_object_messages.pop_front();`
	`1464`	`+ ActiveObjectMessage message = m_active_object_messages_queue.front();`
	`1465`	`+ m_active_object_messages_queue.pop();`
`1466`	`1466`	`return message;`
`1467`	`1467`	`}`
`1468`	`1468`