diff options
author | kwolekr <kwolekr@minetest.net> | 2015-04-21 18:12:01 -0400 |
---|---|---|
committer | kwolekr <kwolekr@minetest.net> | 2015-04-21 18:12:01 -0400 |
commit | e0eec201a18a0741114094b600f765313a838bfb (patch) | |
tree | 1d0b163530902939b61902d393032a07482087ef /src/environment.cpp | |
parent | 972d17baea81ffe6d508b291ef97207a4822e1da (diff) | |
download | minetest-e0eec201a18a0741114094b600f765313a838bfb.tar.gz minetest-e0eec201a18a0741114094b600f765313a838bfb.tar.bz2 minetest-e0eec201a18a0741114094b600f765313a838bfb.zip |
Revert "m_active_object_messages is used like a queue. Use std::queue instead of std::list. Also rename to m_active_object_messages_queue"
This reverts commit 972d17baea81ffe6d508b291ef97207a4822e1da.
The commit being reverted was unauthorized. There had been no discussion,
review, or sign-off prior to submittal to upstream.
Diffstat (limited to 'src/environment.cpp')
-rw-r--r-- | src/environment.cpp | 8 |
1 files changed, 4 insertions, 4 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; } |