From 406b730ef33e3c74d96ecd9bf264b8c520849fe4 Mon Sep 17 00:00:00 2001
From: stiffly <adambylehn@hotmail.com>
Date: Fri, 22 Jan 2016 19:07:20 +0100
Subject: [PATCH] Sends entity names. Temporarily

---
 src/Engine/Network/Client.cpp | 5 +++++
 src/Engine/Network/Server.cpp | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Engine/Network/Client.cpp b/src/Engine/Network/Client.cpp
index 98aeb9a8..1dd2bd04 100644
--- a/src/Engine/Network/Client.cpp
+++ b/src/Engine/Network/Client.cpp
@@ -89,6 +89,7 @@ void Client::parseMessageType(Packet& packet)
         break;
     case MessageType::PlayerConnected:
         parsePlayerConnected(packet);
+        break;
     case MessageType::Kick:
         parseKick();
         break;
@@ -177,8 +178,12 @@ void Client::parseSnapshot(Packet& packet)
 {
     std::string componentType = packet.ReadString();
     while (packet.DataReadSize() < packet.Size()) {
+        // HACK
+        std::string entityName = packet.ReadString();
         // Components EntityID
         EntityID receivedEntityID = packet.ReadPrimitive<EntityID>();
+        // HACK
+        m_World->SetName(receivedEntityID, entityName);
         // Parents EntityID 
         EntityID receivedParentEntityID = packet.ReadPrimitive<EntityID>();
         ComponentInfo componentInfo = m_World->GetComponents(componentType)->ComponentInfo();
diff --git a/src/Engine/Network/Server.cpp b/src/Engine/Network/Server.cpp
index b16a6850..9d0a83d9 100644
--- a/src/Engine/Network/Server.cpp
+++ b/src/Engine/Network/Server.cpp
@@ -1,6 +1,6 @@
 #include "Network/Server.h"
 
-Server::Server() : m_Socket(m_IOService, boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), 13))
+Server::Server() : m_Socket(m_IOService, boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), 27666))
 {
     Network::initialize();
     ConfigFile* config = ResourceManager::Load<ConfigFile>("Config.ini");
@@ -20,6 +20,7 @@ void Server::Start(World* world, EventBroker* eventBroker)
     m_EventBroker = eventBroker;
     // Subscribe to events
     EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &Server::OnInputCommand);
+    EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &Server::OnPlayerSpawned);
     for (size_t i = 0; i < m_MaxConnections; i++) {
         m_PlayerDefinitions[i].StopTime = std::clock();
     }
@@ -180,9 +181,12 @@ void Server::sendSnapshot()
         Packet packet(MessageType::Snapshot);
         ComponentPool* componentPool = it.second;
         ComponentInfo componentInfo = componentPool->ComponentInfo();
+
         // Component Type
         packet.WriteString(componentInfo.Name);
         for (auto& componentWrapper : *componentPool) {
+            // HACK: Send entity name
+            packet.WriteString(m_World->GetName(componentWrapper.EntityID));
             // Components EntityID
             packet.WritePrimitive(componentWrapper.EntityID);
             // Parents EntityID