Merge pull request #134 from teamfisk/HUDDesync

Good job! 👍

include/Engine/Network/Client.h

@@ -103,7 +103,6 @@ public:
     void parseComponentDeletion(Packet& packet);
     void InterpolateFields(Packet & packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
     void parseSnapshot(Packet& packet);
-    void UpdateLocalCapturePointHUD(EntityWrapper capturePointHUD);
     void identifyPacketLoss();
     void hasServerTimedOut();
     EntityID createPlayer();

src/Engine/Network/Client.cpp

@@ -348,9 +348,7 @@ void Client::parseSnapshot(Packet& packet)
                 EntityWrapper localEntity(m_World, localEntityID);
                 // Update entity
                 if (m_World->HasComponent(localEntityID, componentType)) {
-                    if (localEntity.Name() == "CapturePointHUD") {
+
-                        UpdateLocalCapturePointHUD(localEntity);
-                    }
                     SharedComponentWrapper newComponent = createSharedComponent(packet, localEntityID, componentInfo);
                     bool shouldApply = true;
                     // Apply potential filter function
@@ -361,6 +359,7 @@ void Client::parseSnapshot(Packet& packet)
                         ComponentWrapper currentComponent = m_World->GetComponent(localEntityID, componentType);
                         memcpy(currentComponent.Data, newComponent.Data, componentInfo.Stride);
                     }
+
                     //if (localEntity != m_LocalPlayer && !localEntity.IsChildOf(m_LocalPlayer)) {
                     //    updateFields(packet, componentInfo, localEntityID);
                     //} else {
@@ -377,7 +376,11 @@ void Client::parseSnapshot(Packet& packet)
                 if (serverParentID == EntityID_Invalid) {
                     newLocalEntityID = m_World->CreateEntity(EntityID_Invalid);
                 } else {
+                    if (serverClientMapsHasEntity(serverParentID)) {
                         newLocalEntityID = m_World->CreateEntity(m_ServerIDToClientID.at(serverParentID));
+                    } else {
+                        newLocalEntityID = m_World->CreateEntity(EntityID_Invalid);
+                    }
                 }
                 m_World->SetName(newLocalEntityID, serverEntityName);
                 insertIntoServerClientMaps(serverEntityID, newLocalEntityID);
@@ -387,7 +390,7 @@ void Client::parseSnapshot(Packet& packet)
         }
         // Parent logic
         // This should be enough beacause we know that the entities arives in pre-order (there will always be a parent)
-        if (serverParentID != EntityID_Invalid) {
+        if (serverParentID != EntityID_Invalid && serverClientMapsHasEntity(serverParentID)) {
             EntityID localEntityID = m_ServerIDToClientID.at(serverEntityID);
             m_World->SetParent(localEntityID, m_ServerIDToClientID.at(serverParentID));
         }
@@ -395,18 +398,6 @@ void Client::parseSnapshot(Packet& packet)
     parseSpawnEvents();
 }
 
-
-void Client::UpdateLocalCapturePointHUD(EntityWrapper capturePointHUD)
-{
-    //auto children = m_World->GetChildren(capturePointHUD.ID);
-    //for (auto it = children.first; it != children.second; it++) {
-    //    it->first
-    //}
-    //
-    //EntityWrapper& localHUD = m_LocalPlayer.FirstChildByName("HUD").FirstChildByName("CapturePointHUD");
-    //m_World->GetComponentPools()
-}
-
 void Client::disconnect()
 {
     m_IsConnected = false;

src/Engine/Network/Server.cpp

@@ -191,10 +191,7 @@ void Server::addPlayersToPacket(Packet & packet, EntityID entityID)
         // HACK: Only sync players for now, since the map turned out to be TOO LARGE to send in one snapshot and Simon's computer shits itself
         // HACK: Also checked CapturePointHUD for now. (this would get out of sync);
         EntityWrapper childEntity(m_World, childEntityID);
-        if (!shouldSendToClient(childEntity)) {
+        if (shouldSendToClient(childEntity)) {
-            continue;
-        }
-
             // Write EntityID and parentsID and Entity name
             packet.WritePrimitive(childEntityID);
             packet.WritePrimitive(entityID);
@@ -226,8 +223,9 @@ void Server::addPlayersToPacket(Packet & packet, EntityID entityID)
                     }
                 }
             }
+        }
         // Go to to your children
-        addChildrenToPacket(packet, childEntityID);
+        addPlayersToPacket(packet, childEntityID);
     }
 }
 
@@ -455,8 +453,7 @@ bool Server::OnInputCommand(const Events::InputCommand & e)
         }
         isReadingData = !isReadingData;
         m_SaveDataTimer = std::clock();
-    }
+    } else if (e.Command == "KickPlayer" && e.Value > 0) {
-    else if (e.Command == "KickPlayer" && e.Value > 0) {
         kick(0);
     }
 
@@ -595,8 +592,15 @@ void Server::parsePlayerTransform(Packet& packet)
 
 bool Server::shouldSendToClient(EntityWrapper childEntity)
 {
+    auto children = m_World->GetChildren(childEntity.ID);
+    for (auto it = children.first; it != children.second; it++) {
+        EntityWrapper child(m_World, it->second);
+        if(child.HasComponent("CapturePoint")) {
+            return true;
+        }
+    }
     return childEntity.HasComponent("Player") || childEntity.FirstParentWithComponent("Player").Valid()
-        || childEntity.HasComponent("CapturePoint") || childEntity.FirstParentWithComponent("CapturePoint").Valid();
+        || childEntity.HasComponent("CapturePoint");
 }
 
 PlayerID Server::GetPlayerIDFromEndpoint()

src/Game/Systems/CapturePointSystem.cpp

@@ -6,9 +6,11 @@ CapturePointSystem::CapturePointSystem(SystemParams params)
     , PureSystem("CapturePoint")
 {
     //subscribe/listenTo playerdamage,healthpickup events (using the eventBroker)
+    if (!IsClient) {
         EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &CapturePointSystem::OnTriggerTouch);
         EVENT_SUBSCRIBE_MEMBER(m_ETriggerLeave, &CapturePointSystem::OnTriggerLeave);
         EVENT_SUBSCRIBE_MEMBER(m_ECaptured, &CapturePointSystem::OnCaptured);
+    }
 
 }
 
@@ -16,6 +18,9 @@ CapturePointSystem::CapturePointSystem(SystemParams params)
 //NOTE: needs to run each frame, since we're possibly modifying the captureTimer for the capturePoints by dt
 void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, ComponentWrapper& cCapturePoint, double dt)
 {
+    if (IsClient) {
+        return;
+    }
     if (m_WinnerWasFound) {
         return;
     }