Merge remote-tracking branch 'origin/Menu' into WeaponSystem

# Conflicts:
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Types/Entity.xsd

src/Game/Systems/AmmunitionHUDSystem.cpp

@@ -0,0 +1,36 @@
+#include "Game/Systems/AmmunitionHUDSystem.h"
+
+void AmmunitionHUDSystem::Update(double dt)
+{
+    //Hud element for tracking ammunition from parent with AssaultWeapon component.Child with the name "MagazineAmmo" tracks clip ammunition.Child with the name "Ammo" tracks ammo.</xs:documentation>
+
+    auto ammunitionHUDs = m_World->GetComponents("AmmunitionHUD");
+    if (ammunitionHUDs == nullptr) {
+        return;
+    }
+
+    for (auto& ammunitionHUDComponent : *ammunitionHUDs) {
+        EntityWrapper entity = EntityWrapper(m_World, ammunitionHUDComponent.EntityID);
+
+        EntityWrapper playerEntity = entity.FirstParentWithComponent("AssaultWeapon");
+
+        if (!playerEntity.Valid()) {
+            return;
+        }
+        
+
+        EntityWrapper magazineAmmo = entity.FirstChildByName("MagazineAmmo");
+        if(magazineAmmo.Valid()) {
+            if(magazineAmmo.HasComponent("Text")) {
+                (std::string&)magazineAmmo["Text"]["Content"] = std::to_string((int)playerEntity["AssaultWeapon"]["MagazineAmmo"]);
+            }
+        }
+
+        EntityWrapper ammo = entity.FirstChildByName("Ammo");
+        if (ammo.Valid()) {
+            if (ammo.HasComponent("Text")) {
+                (std::string&)ammo["Text"]["Content"] = std::to_string((int)playerEntity["AssaultWeapon"]["Ammo"]);
+            }
+        }
+    }
+}

src/Game/Systems/CapturePointHUDSystem.cpp

@@ -20,6 +20,10 @@ void CapturePointHUDSystem::Update(double dt)
         return;
     }
 
+    if(!CapturePointHUDElements) {
+        return;
+    }
+
     for (auto& cCapturePointHUD : *CapturePointHUDElements) {
         int HUD_ID = cCapturePointHUD["CapturePointNumber"];
         EntityWrapper entityHUD = EntityWrapper(m_World, cCapturePointHUD.EntityID);

src/Game/Systems/HealthHUDSystem.cpp

@@ -1,6 +1,6 @@
-#include "Game/Systems/PlayerHUDSystem.h"
+#include "Game/Systems/HealthHUDSystem.h"
 
-void PlayerHUDSystem::Update(double dt)
+void HealthHUDSystem::Update(double dt)
 {
     auto healthHUDs = m_World->GetComponents("HealthHUD");
     if (healthHUDs == nullptr) {
@@ -27,13 +27,13 @@ void PlayerHUDSystem::Update(double dt)
                 s = s + "/";
                 s = s + std::to_string((int)(double)entityIDParent["Health"]["MaxHealth"]);
                 float healthPercentage = (double)entityIDParent["Health"]["Health"]/(double)entityIDParent["Health"]["MaxHealth"];
-                (glm::vec4&)entity["Text"]["Color"] = glm::vec4(1.0 - healthPercentage, 0.f, healthPercentage, 1.f);
+                (glm::vec4&)entity["Text"]["Color"] = glm::vec4(1.0 - healthPercentage, 0.f, healthPercentage, glm::vec4(entity["Text"]["Color"]).a);
                 entity["Text"]["Content"] = s;
             }
 
             if(entity.HasComponent("Fill")) {
                 float healthPercentage = (double)entityIDParent["Health"]["Health"]/(double)entityIDParent["Health"]["MaxHealth"];
-                (glm::vec4&)entity["Fill"]["Color"] = glm::vec4(1.0 - healthPercentage, 0.f, healthPercentage, 0.f);
+                (glm::vec4&)entity["Fill"]["Color"] = glm::vec4(1.0 - healthPercentage, 0.f, healthPercentage, glm::vec4(entity["Fill"]["Color"]).a);
                 (double&)entity["Fill"]["Percentage"] = healthPercentage;
 
             }