Updated all uses of EntityXMLFile to use the new EntityFile to load entities into a world.

include/Engine/Core/EntityXMLFileParser.h

@@ -6,12 +6,13 @@
 
 class EntityXMLFileParser
 {
+    friend class EntityFile;
 public:
     EntityXMLFileParser(const EntityXMLFile* entityFile);
 
+private:
     EntityID MergeEntities(World* world, EntityID baseParent = EntityID_Invalid);
 
-private:
     const EntityXMLFile* m_EntityFile;
     EntityFileHandler m_Handler;
     World* m_World = nullptr;

include/Engine/Core/EntityXMLFilePreprocessor.h

@@ -21,12 +21,13 @@
 
 class EntityXMLFilePreprocessor
 {
+    friend class EntityFile;
 public:
     EntityXMLFilePreprocessor(const EntityXMLFile* entityFile);
 
+private:
     void RegisterComponents(World* world);
 
-private:
     const EntityXMLFile* m_EntityFile;
     std::map<std::string, unsigned int> m_ComponentCounts;
 	std::map<std::string, ComponentInfo> m_ComponentInfo;

include/Engine/Editor/EditorSystem.h

@@ -5,8 +5,7 @@
 #include "../Core/World.h"
 #include "../Core/SystemPipeline.h"
 #include "../Core/ResourceManager.h"
-#include "../Core/EntityXMLFilePreprocessor.h"
-#include "../Core/EntityXMLFileParser.h"
+#include "../Core/EntityFile.h"
 #include "../Core/EntityXMLFileWriter.h"
 #include "../Core/EMousePress.h"
 #include "../Input/EInputCommand.h"