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
@@ -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
 {