From a8651846ae33aee478c909a7198946a0fb806429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Wed, 8 Nov 2017 13:14:00 +0100 Subject: [PATCH] Sdk/World: Fix movement not taking waiting entities into account --- SDK/include/NDK/World.inl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SDK/include/NDK/World.inl b/SDK/include/NDK/World.inl index 0cb0fc7c9..c5ea48db1 100644 --- a/SDK/include/NDK/World.inl +++ b/SDK/include/NDK/World.inl @@ -306,12 +306,15 @@ namespace Ndk m_killedEntities = std::move(world.m_killedEntities); m_orderedSystems = std::move(world.m_orderedSystems); m_orderedSystemsUpdated = world.m_orderedSystemsUpdated; - m_waitingEntities = std::move(world.m_waitingEntities); m_entities = std::move(world.m_entities); for (EntityBlock& block : m_entities) block.entity.SetWorld(this); + m_waitingEntities = std::move(world.m_waitingEntities); + for (auto& blockPtr : m_waitingEntities) + blockPtr->entity.SetWorld(this); + m_systems = std::move(world.m_systems); for (const auto& systemPtr : m_systems) if (systemPtr)