EquippedItem,Ammo got changed to int instead of double. Loading entities from map the new way in Tests. ComponentWrapper:s Name is now Type

include/Engine/Core/ComponentWrapper.h

@@ -78,7 +78,7 @@ public:
     void AddProperty(std::string fieldName, T defaultValue)
     {
         m_DefaultValues.push_back(defaultValue);
-        m_ComponentInfo.Fields[fieldName].Name = typeid(T).name();
+        m_ComponentInfo.Fields[fieldName].Type = typeid(T).name();
         m_ComponentInfo.Fields[fieldName].Offset = m_ComponentInfo.Meta.Stride;
         m_ComponentInfo.Fields[fieldName].Stride = sizeof(T);
         m_ComponentInfo.Meta.Stride += sizeof(T);

include/Game/PlayerSystem.h

@@ -37,8 +37,8 @@ private:
     bool PlayerSystem::OnMouseRelease(const Events::MouseRelease& e);
     enum class HeldItem {
         None = 0,
-        PrimaryWeapon = 1,
-        SecondaryWeapon = 2
+        PrimaryItem = 1,
+        SecondaryItem = 2
     };
 };