Fixed merge conflicts. Scoreboard updates team when a team is picked. Fixed some code standard violations and misspellings.

include/Engine/Core/ECaptured.h

@@ -1,5 +1,5 @@
-#ifndef ECaptured_h__
-#define ECaptured_h__
+#ifndef Events_Captured_h__
+#define Events_Captured_h__
 
 #include "EventBroker.h"
 #include "../Core/Entity.h"

include/Engine/Network/Server.h

@@ -52,9 +52,9 @@ private:
     char readBuffer[BUFFERSIZE] = { 0 };
     size_t bytesRead = 0;
     // time for previouse message
-    double previousePingMessage = 0;
+    double previousPingMessage = 0;
     double previousSnapshotMessage = 0;
-    double timOutTimer = 0;
+    double timeOutTimer = 0;
 
     // How often we send messages (seconds)
     double pingInterval = 1;

include/Game/Events/EReset.h

@@ -1,5 +1,5 @@
-#ifndef Reset_h__
-#define Reset_h__
+#ifndef Events_Reset_h__
+#define Events_Reset_h__
 
 #include "Core/EventBroker.h"
 #include "Core/EntityWrapper.h"

include/Game/Systems/ScoreScreenSystem.h

@@ -9,6 +9,7 @@
 #include "Network/EPlayerConnected.h"
 #include "Network/EPlayerDisconnected.h"
 #include "Game/Events/EReset.h"
+#include "Engine/Input/EInputCommand.h"
 #include "GLM.h"
 
 class ScoreScreenSystem : public PureSystem
@@ -28,6 +29,8 @@ public:
     bool OnPlayerDisconnected(const Events::PlayerDisconnected& e);
     EventRelay<ScoreScreenSystem, Events::Reset> m_EReset;
     bool OnReset(const Events::Reset& e);
+    EventRelay<ScoreScreenSystem, Events::InputCommand> m_EInputCommand;
+    bool OnInputCommand(const Events::InputCommand& e);
 
 private:
     struct PlayerData {