Merge remote-tracking branch 'origin/Networking' into Networking

include/Engine/Core/EPlayerSpawned.h

@@ -0,0 +1,19 @@
+#ifndef EPlayerSpawned_h__
+#define EPlayerSpawned_h__
+
+#include "Core/Event.h"
+#include "Core/EntityWrapper.h"
+
+namespace Events
+{
+
+struct PlayerSpawned : Event
+{
+    int PlayerID;
+    EntityWrapper Player;
+    EntityWrapper Spawner;
+};
+
+}
+
+#endif

include/Engine/Core/EntityWrapper.h

@@ -26,6 +26,7 @@ struct EntityWrapper
     bool HasComponent(const std::string& componentName);
     EntityWrapper Parent();
     EntityWrapper FirstChildByName(const std::string& name);
+    bool IsChildOf(EntityWrapper potentialParent);
     bool Valid();
 
     ComponentWrapper operator[](const char* componentName);

include/Engine/Network/Client.h

@@ -20,7 +20,7 @@
 #include "Input/EInputCommand.h"
 #include "Core/EPlayerDamage.h"
 #include "Network/EInterpolate.h"
-#include "Game/Events/EPlayerSpawned.h"
+#include "Core/EPlayerSpawned.h"
 
 class Client : public Network
 {

include/Engine/Network/Server.h

@@ -15,8 +15,7 @@
 #include "Input/EInputCommand.h"
 #include "Core/EPlayerDamage.h"
 #include "Network/EPlayerDisconnected.h"
-
-#include "Game/Events/EPlayerSpawned.h"
+#include "Core/EPlayerSpawned.h"
 
 class Server : public Network
 {

include/Engine/Rendering/RenderSystem.h

@@ -15,7 +15,7 @@
 #include "Renderer.h"
 #include "PointLightJob.h"
 #include "../Core/Transform.h"
-#include "../../Game/Events/EPlayerSpawned.h"
+#include "../Core/EPlayerSpawned.h"
 
 class RenderSystem : public ImpureSystem
 {