From f4983cf9610d6a2562cee64d29b86598e950cf22 Mon Sep 17 00:00:00 2001
From: Tleety <dahltobbe@hotmail.com>
Date: Thu, 3 Mar 2016 13:53:40 +0100
Subject: [PATCH] WIP

---
 resources/Schema/Entities/ScoreIdentity.xml | 104 ++++++++++++--------
 src/Game/Systems/ScoreScreenSystem.cpp      |   7 +-
 2 files changed, 65 insertions(+), 46 deletions(-)

diff --git a/resources/Schema/Entities/ScoreIdentity.xml b/resources/Schema/Entities/ScoreIdentity.xml
index 7d1e2437..daf9d4eb 100644
--- a/resources/Schema/Entities/ScoreIdentity.xml
+++ b/resources/Schema/Entities/ScoreIdentity.xml
@@ -9,24 +9,17 @@
   </Components>
 
   <Children>
-    <Entity name="Simonplzpush">
-      <Components>
-        <c:Text>
-          <Content>Simon needs to push shit shit so i can write text from Component</Content>
-          <Resource>Fonts/DroidSans.ttf,64</Resource>
-        </c:Text>
-        <c:Transform>
-          <Position X="0" Y="2.09157753" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
     <Entity name="ID">
       <Components>
         <c:Text>
-          <Content>ID</Content>
+          <Content>-1</Content>
           <Resource>Fonts/DroidSans.ttf,64</Resource>
         </c:Text>
+        <c:TextFieldReader>
+          <ParentEntityName>ScoreIdentity</ParentEntityName>
+          <ComponentType>ScoreIdentity</ComponentType>
+          <Field>ID</Field>
+        </c:TextFieldReader>
         <c:Transform>
           <Position X="-9.66245842" Y="0" Z="0"/>
         </c:Transform>
@@ -36,35 +29,16 @@
     <Entity name="Name">
       <Components>
         <c:Text>
-          <Content>DickButt</Content>
+          <Content></Content>
           <Resource>Fonts/DroidSans.ttf,64</Resource>
         </c:Text>
+        <c:TextFieldReader>
+          <ParentEntityName>ScoreIdentity</ParentEntityName>
+          <ComponentType>ScoreIdentity</ComponentType>
+          <Field>Name</Field>
+        </c:TextFieldReader>
         <c:Transform>
-          <Position X="-5.08430147" Y="0" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="Kills">
-      <Components>
-        <c:Text>
-          <Content>5</Content>
-          <Resource>Fonts/DroidSans.ttf,64</Resource>
-        </c:Text>
-        <c:Transform>
-          <Position X="-1.23991621" Y="0" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children/>
-    </Entity>
-    <Entity name="Deaths">
-      <Components>
-        <c:Text>
-          <Content>12</Content>
-          <Resource>Fonts/DroidSans.ttf,64</Resource>
-        </c:Text>
-        <c:Transform>
-          <Position X="1.3544426" Y="0" Z="0"/>
+          <Position X="-6.30237818" Y="0" Z="0"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -72,11 +46,50 @@
     <Entity name="KD">
       <Components>
         <c:Text>
-          <Content>0.42</Content>
+          <Content>0</Content>
           <Resource>Fonts/DroidSans.ttf,64</Resource>
         </c:Text>
+        <c:TextFieldReader>
+          <ParentEntityName>ScoreIdentity</ParentEntityName>
+          <ComponentType>ScoreIdentity</ComponentType>
+          <Field>KD</Field>
+        </c:TextFieldReader>
         <c:Transform>
-          <Position X="4.43798256" Y="0" Z="0"/>
+          <Position X="-1.88777053" Y="0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Kills">
+      <Components>
+        <c:Text>
+          <Content>0</Content>
+          <Resource>Fonts/DroidSans.ttf,64</Resource>
+        </c:Text>
+        <c:TextFieldReader>
+          <ParentEntityName>ScoreIdentity</ParentEntityName>
+          <ComponentType>ScoreIdentity</ComponentType>
+          <Field>Kills</Field>
+        </c:TextFieldReader>
+        <c:Transform>
+          <Position X="0.558054805" Y="0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity name="Deaths">
+      <Components>
+        <c:Text>
+          <Content>0</Content>
+          <Resource>Fonts/DroidSans.ttf,64</Resource>
+        </c:Text>
+        <c:TextFieldReader>
+          <ParentEntityName>ScoreIdentity</ParentEntityName>
+          <ComponentType>ScoreIdentity</ComponentType>
+          <Field>Deaths</Field>
+        </c:TextFieldReader>
+        <c:Transform>
+          <Position X="2.71133566" Y="0" Z="0"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -84,11 +97,16 @@
     <Entity name="Ping">
       <Components>
         <c:Text>
-          <Content>84</Content>
+          <Content>0</Content>
           <Resource>Fonts/DroidSans.ttf,64</Resource>
         </c:Text>
+        <c:TextFieldReader>
+          <ParentEntityName>ScoreIdentity</ParentEntityName>
+          <ComponentType>ScoreIdentity</ComponentType>
+          <Field>Ping</Field>
+        </c:TextFieldReader>
         <c:Transform>
-          <Position X="8.05187988" Y="0" Z="0"/>
+          <Position X="5.79302835" Y="0" Z="0"/>
         </c:Transform>
       </Components>
       <Children/>
diff --git a/src/Game/Systems/ScoreScreenSystem.cpp b/src/Game/Systems/ScoreScreenSystem.cpp
index 361d9f1f..0713e13b 100644
--- a/src/Game/Systems/ScoreScreenSystem.cpp
+++ b/src/Game/Systems/ScoreScreenSystem.cpp
@@ -14,6 +14,10 @@ ScoreScreenSystem::ScoreScreenSystem(SystemParams params)
 void ScoreScreenSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& capturePoint, double dt)
 {
     //TODO: Check team al
+    if (!IsServer) {
+        return;
+    }
+
     if(!entity.HasComponent("ScoreScreen")){
         return;
     }
@@ -62,9 +66,6 @@ void ScoreScreenSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper&
             (int&)cScoreIdentity["ID"] = data.ID;
             (int&)cScoreIdentity["Ping"] = 1337;
 
-            std::string IdentityName = "#" + std::to_string(data.ID) + ": " + data.Name;
-
-            m_World->SetName(scoreIdentity.ID, IdentityName);
             m_World->SetParent(scoreIdentity.ID, entity.ID);
         }
     }