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

2016-01-23 16:41:42 +01:00
parent 2bf0434bcb 4d5cbb6057
commit 6d2c656a04
11 changed files with 25 additions and 29 deletions
@@ -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);
@@ -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
 {
@@ -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
 {
@@ -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
 {
@@ -12,7 +12,7 @@
 #include "Core/EventBroker.h"
 #include "Core/ResourceManager.h"
 #include "Core/ConfigFile.h"
-#include "Events/EPlayerSpawned.h"
+#include "Core/EPlayerSpawned.h"

 #include "Network/EInterpolate.h"

@@ -1,7 +1,7 @@
 #include "Common.h"
 #include "GLM.h"
 #include "Core/System.h"
-#include "Events/EPlayerSpawned.h"
+#include "Core/EPlayerSpawned.h"
 #include "Input/FirstPersonInputController.h"

 class PlayerMovementSystem : public ImpureSystem, PureSystem
@@ -2,7 +2,7 @@
 #include "Input/EInputCommand.h"
 #include "Systems/SpawnerSystem.h"
 #include "Events/ESpawnerSpawn.h"
-#include "Events/EPlayerSpawned.h"
+#include "Core/EPlayerSpawned.h"
 #include "Rendering/ESetCamera.h"
 #include "Core/ConfigFile.h"