diff options
author | Loïc Blot <nerzhul@users.noreply.github.com> | 2020-04-10 19:49:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-10 19:49:20 +0200 |
commit | f648fb76aef96a1da608c64346fc65d4dd44caa8 (patch) | |
tree | 5f46a0d40742c7ae3e81f58728a702c8f3d6035e /src/serverenvironment.cpp | |
parent | 2349d31bae1bfc4d58fd88efbc88261e69b11dad (diff) | |
download | hax-minetest-server-f648fb76aef96a1da608c64346fc65d4dd44caa8.tar.gz hax-minetest-server-f648fb76aef96a1da608c64346fc65d4dd44caa8.zip |
Drop genericobject.{cpp,h} (#9629)
* Drop genericobject.{cpp,h}
This file is not for generic object but for ActiveObject message passing.
Put ownership of the various commands to the right objects and cleanup the related code.
* Protect ServerActiveObject::m_messages_out
* typo fix
Diffstat (limited to 'src/serverenvironment.cpp')
-rw-r--r-- | src/serverenvironment.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/serverenvironment.cpp b/src/serverenvironment.cpp index 333d32ff5..2d3ee078e 100644 --- a/src/serverenvironment.cpp +++ b/src/serverenvironment.cpp @@ -1420,10 +1420,7 @@ void ServerEnvironment::step(float dtime) // Step object obj->step(dtime, send_recommended); // Read messages from object - while (!obj->m_messages_out.empty()) { - this->m_active_object_messages.push(obj->m_messages_out.front()); - obj->m_messages_out.pop(); - } + obj->dumpAOMessagesToQueue(m_active_object_messages); }; m_ao_manager.step(dtime, cb_state); } |