Merge remote-tracking branch 'origin/master' into Menu

2016-03-11 14:57:59 +01:00
parent 44398eac58 edb305b307
commit 0ca627eb8b
13 changed files with 162 additions and 33 deletions
@@ -3,6 +3,7 @@

 #include "Core/System.h"
 #include "Input/EInputCommand.h"
+#include "Network/EPlayerDisconnected.h"

 class SpectatorCameraSystem : public ImpureSystem
 {
@@ -17,6 +18,8 @@ private:

    EventRelay<SpectatorCameraSystem, Events::InputCommand> m_EInputCommand;
    bool OnInputCommand(const Events::InputCommand& e);
+    EventRelay<SpectatorCameraSystem, Events::PlayerDisconnected> m_EDisconnect;
+    bool OnDisconnect(const Events::PlayerDisconnected& e);
 };

 #endif