From bdbf86493412ce46e18c5a35d1abc803b53fece5 Mon Sep 17 00:00:00 2001
From: viktorljung <vilb12@student.bth.se>
Date: Mon, 14 Mar 2016 16:46:03 +0100
Subject: [PATCH] spawning 1 shield on server and one on client

---
 resources/Schema/Entities/DefenderShield.xml  | 22 ++-----------------
 .../Weapon/DefenderWeaponBehaviour.cpp        |  8 +++++++
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/resources/Schema/Entities/DefenderShield.xml b/resources/Schema/Entities/DefenderShield.xml
index d2cca1da..d8fe3e10 100755
--- a/resources/Schema/Entities/DefenderShield.xml
+++ b/resources/Schema/Entities/DefenderShield.xml
@@ -31,17 +31,8 @@
           <Components>
             <c:Animation>
               <AnimationName>ActivateShieldU</AnimationName>
-              <Loop>false</Loop>
-            </c:Animation>
-            <c:Transform/>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="Idle">
-          <Components>
-            <c:Animation>
-              <AnimationName>ShieldFrontU</AnimationName>
               <Play>true</Play>
+              <Loop>false</Loop>
             </c:Animation>
             <c:Transform/>
           </Components>
@@ -74,16 +65,7 @@
           <Components>
             <c:Animation>
               <AnimationName>ActivateShieldU</AnimationName>
-              <Loop>false</Loop>
-            </c:Animation>
-            <c:Transform/>
-          </Components>
-          <Children/>
-        </Entity>
-        <Entity name="Idle">
-          <Components>
-            <c:Animation>
-              <AnimationName>ShieldFrontU</AnimationName>
+              <Play>true</Play>
               <Loop>false</Loop>
             </c:Animation>
             <c:Transform/>
diff --git a/src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp b/src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp
index 66688c5d..ae74921d 100644
--- a/src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp
+++ b/src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp
@@ -162,6 +162,7 @@ bool DefenderWeaponBehaviour::OnInputCommand(ComponentWrapper cWeapon, WeaponInf
 
                 SpawnerSystem::Spawn(attachment, attachment);
                 
+/*
 
                 EntityWrapper backAttachment = attachment.FirstChildByName("Back");
                 if (backAttachment.Valid()) {
@@ -171,7 +172,11 @@ bool DefenderWeaponBehaviour::OnInputCommand(ComponentWrapper cWeapon, WeaponInf
                     eDeployShieldAttachement.Restart = true;
                     eDeployShieldAttachement.Start = true;
                     m_EventBroker->Publish(eDeployShieldAttachement);
+                } else {
+                    LOG_ERROR("back shield invalid");
                 }
+
+
                 EntityWrapper frontAttachment = attachment.FirstChildByName("Front");
                 if (frontAttachment.Valid()) {
                     Events::AutoAnimationBlend eDeployShieldAttachement;
@@ -181,7 +186,10 @@ bool DefenderWeaponBehaviour::OnInputCommand(ComponentWrapper cWeapon, WeaponInf
                     eDeployShieldAttachement.Start = true;
                     m_EventBroker->Publish(eDeployShieldAttachement);
 
+                } else {
+                    LOG_ERROR("front shield invalid");
                 }
+*/
 
                 if (IsClient) {
                     EntityWrapper root = wi.FirstPersonEntity;