Made EntityFileParser::MergeEntities return the base entity that was created, and also take an optional parent entity to create it under.

2016-01-15 18:31:32 +01:00
parent 0469460029
commit 97e12ff550
3 changed files with 9 additions and 4 deletions
@@ -77,7 +77,7 @@ public:
        : m_Handler(handler)
        , m_Reader(reader)
    {
-        // 0 is imaginary world entity
+        // 0 is imaginary base parent
        m_EntityStack.push(0);
        m_StateStack.push(State::Unknown);
    }