From a060640da3eee5e2017819fbd4fa8322302645e9 Mon Sep 17 00:00:00 2001
From: Jocke <joachimpetterson@gmail.com>
Date: Wed, 13 Jan 2016 18:00:12 +0100
Subject: [PATCH] Removed unnecessary unnecessary if in Client::OnInputCommand.

Change name from Server::parseEvent to Server::parseOnInputCommand
---
 include/Engine/Network/Client.h      |  3 ++-
 include/Engine/Network/MessageType.h |  1 +
 include/Engine/Network/Server.h      |  2 +-
 src/Engine/Network/Client.cpp        | 13 ++++++-------
 src/Engine/Network/Server.cpp        |  6 ++++--
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/include/Engine/Network/Client.h b/include/Engine/Network/Client.h
index da734810..6b73c95c 100644
--- a/include/Engine/Network/Client.h
+++ b/include/Engine/Network/Client.h
@@ -81,8 +81,9 @@ private:
     bool hasMappedEntity(EntityID entityID);
     // Events
     EventBroker* m_EventBroker;
+   
     EventRelay<Client, Events::InputCommand> m_EInputCommand;
-    bool OnInputCommand(const Events::InputCommand &e);
+    bool OnInputCommand(const Events::InputCommand& e);
 };
 
 #endif
diff --git a/include/Engine/Network/MessageType.h b/include/Engine/Network/MessageType.h
index 8d09c7ee..68bda9b0 100644
--- a/include/Engine/Network/MessageType.h
+++ b/include/Engine/Network/MessageType.h
@@ -12,6 +12,7 @@ enum class MessageType
 	Message,
 	Snapshot,
 	Event,
+    OnInputCommand
 };
 
 #endif
diff --git a/include/Engine/Network/Server.h b/include/Engine/Network/Server.h
index 84d8c143..ec2560b5 100644
--- a/include/Engine/Network/Server.h
+++ b/include/Engine/Network/Server.h
@@ -68,7 +68,7 @@ private:
     void checkForTimeOuts();
     void disconnect(int i);
     void parseMessageType(Packet& packet);
-    void parseEvent(Packet& packet);
+    void parseOnInputCommand(Packet& packet);
     void parseConnect(Packet& packet);
     void parseDisconnect();
     void parseClientPing();
diff --git a/src/Engine/Network/Client.cpp b/src/Engine/Network/Client.cpp
index 3ecee0e0..37ee35d9 100644
--- a/src/Engine/Network/Client.cpp
+++ b/src/Engine/Network/Client.cpp
@@ -254,7 +254,6 @@ int Client::receive(char* data, size_t length)
     if (error) {
         LOG_ERROR("receive: %s", error.message().c_str());
     }
-
     return bytesReceived;
 }
 
@@ -297,18 +296,18 @@ void Client::moveMessageHead(char*& data, size_t& length, size_t stepSize)
 
 bool Client::OnInputCommand(const Events::InputCommand & e)
 {
-    if (e.Command == "Forward" || e.Command == "Right") {
-        Packet packet(MessageType::Event, m_SendPacketID);
+    if (e.Command == "ConnectToServer") { // Connect for now
+        connect();
+        LOG_INFO("Client::OnInputCommand: Command is %s. Value is %f. PlayerID is %i.", e.Command.c_str(), e.Value, e.PlayerID);
+        return true;
+    } else {
+        Packet packet(MessageType::OnInputCommand, m_SendPacketID);
         packet.WriteString(e.Command);
         packet.WritePrimitive(e.PlayerID);
         packet.WritePrimitive(e.Value);
         send(packet);
         LOG_INFO("Client::OnInputCommand: Command is %s. Value is %f. PlayerID is %i.", e.Command.c_str(), e.Value, e.PlayerID);
         return true;
-    } else if (e.Command == "ConnectToServer") { // Connect for now
-        connect();
-        LOG_INFO("Client::OnInputCommand: Command is %s. Value is %f. PlayerID is %i.", e.Command.c_str(), e.Value, e.PlayerID);
-        return true;
     }
     return false;
 }
diff --git a/src/Engine/Network/Server.cpp b/src/Engine/Network/Server.cpp
index e98213a5..6b59a31a 100644
--- a/src/Engine/Network/Server.cpp
+++ b/src/Engine/Network/Server.cpp
@@ -81,8 +81,10 @@ void Server::parseMessageType(Packet& packet)
         parseDisconnect();
         break;
     case MessageType::Event:
-        parseEvent(packet);
         break;
+    case MessageType::OnInputCommand:
+        parseOnInputCommand(packet);
+        break;;
     default:
         break;
     }
@@ -218,7 +220,7 @@ void Server::disconnect(int i)
     m_PlayerDefinitions[i].Name = "";
 }
 
-void Server::parseEvent(Packet& packet)
+void Server::parseOnInputCommand(Packet& packet)
 {
     size_t i;
     for (i = 0; i < MAXCONNECTIONS; i++) {