fixup! Created World::Merge which will merge a world into another one

2016-03-02 19:50:52 +01:00
parent 618e96da90
commit 44b4a597d4
2 changed files with 9 additions and 7 deletions
@@ -55,7 +55,7 @@ public:

    // Merge another world into this one
    // Returns a map that maps entities from the other world to their copies in this one
-    std::unordered_map<EntityID, EntityID> Merge(World& other);
+    std::unordered_map<EntityID, EntityID> Merge(const World* other);

 private:
    EventBroker* m_EventBroker = nullptr;