minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Re-apply 972d17baea81ffe6d508b291ef97207a4822e1da... 

but not rename the container. Approved-By est31
This commit is contained in:
nerzhul 2015-04-22 11:47:22 +02:00
parent 17a173f474
commit eec01bc2fa
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/environment.cpp
View File

@ -1238,7 +1238,7 @@ void ServerEnvironment::step(float dtime)
// Read messages from object // Read messages from object
while(!obj->m_messages_out.empty()) 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.front());
obj->m_messages_out.pop(); obj->m_messages_out.pop();
} }
@ -1462,7 +1462,7 @@ ActiveObjectMessage ServerEnvironment::getActiveObjectMessage()
return ActiveObjectMessage(0); return ActiveObjectMessage(0);
ActiveObjectMessage message = m_active_object_messages.front(); ActiveObjectMessage message = m_active_object_messages.front();
m_active_object_messages.pop_front(); m_active_object_messages.pop();
return message; return message;
} }

3
src/environment.h
View File

@ -32,6 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <set> #include <set>
#include <list> #include <list>
#include <queue>
#include <map> #include <map>
#include "irr_v3d.h" #include "irr_v3d.h"
#include "activeobject.h" #include "activeobject.h"
@ -378,7 +379,7 @@ private:
// Active object list // Active object list
std::map<u16, ServerActiveObject*> m_active_objects; std::map<u16, ServerActiveObject*> m_active_objects;
// Outgoing network message buffer for 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 // Some timers
float m_send_recommended_timer; float m_send_recommended_timer;
IntervalLimiter m_object_management_interval; IntervalLimiter m_object_management_interval;