From eec01bc2fabbefbe0d0c008011592d49f8bbd18e Mon Sep 17 00:00:00 2001 From: nerzhul Date: Wed, 22 Apr 2015 11:47:22 +0200 Subject: Re-apply 972d17baea81ffe6d508b291ef97207a4822e1da... but not rename the container. Approved-By est31 --- src/environment.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/environment.cpp') 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; } -- cgit v1.2.3