fix: Another attempt to fix CI.

This mostly reverts commit 169df1a.

Author: tupoy-ya

src/services/gta_data/gta_data_service.cpp

@@ -24,9 +24,14 @@ namespace big
 		return false;
 	}
 
+	static weapon_item empty_weapon;
+	static weapon_component empty_component;
+
 	gta_data_service::gta_data_service() :
 	    m_update_state(eGtaDataUpdateState::IDLE)
 	{
+		empty_weapon = {};
+		empty_component = {};
 	}
 
 	bool gta_data_service::init()
@@ -88,23 +93,23 @@ namespace big
 		for (const auto& [name, weapon] : m_weapons_cache.weapon_map)
 			if (weapon.m_hash == hash)
 				return weapon;
-		return gta_data_service::empty_weapon;
+		return empty_weapon;
 	}
 
 	const weapon_component& gta_data_service::weapon_component_by_hash(uint32_t hash)
 	{
 		for (const auto& [name, component] : m_weapons_cache.weapon_components)
 			if (component.m_hash == hash)
 				return component;
-		return gta_data_service::empty_component;
+		return empty_component;
 	}
 
 	const weapon_component& gta_data_service::weapon_component_by_name(std::string name)
 	{
 		for (const auto& [name_key, component] : m_weapons_cache.weapon_components)
 			if (name_key == name)
 				return component;
-		return gta_data_service::empty_component;
+		return empty_component;
 	}
 
 	string_vec& gta_data_service::ped_types()
@@ -275,9 +280,9 @@ namespace big
 
 		std::vector<ped_item> peds;
 		std::vector<vehicle_item> vehicles;
-		//std::vector<weapon_item_parsed> weapons;
+		//std::vector<weapon_item> weapons;
 		std::unordered_map<Hash, weapon_item_parsed> weapons;
-		std::vector<weapon_component_parsed> weapon_components;
+		std::vector<weapon_component> weapon_components;
 
 		constexpr auto exists = [](const hash_array& arr, uint32_t val) -> bool {
 			return std::find(arr.begin(), arr.end(), val) != arr.end();
@@ -354,7 +359,7 @@ namespace big
 						if (LocDesc.ends_with("INVALID"))
 							LocDesc.clear();
 
-						weapon_component_parsed component;
+						weapon_component component;
 
 						component.m_name         = name;
 						component.m_hash         = hash;

src/services/gta_data/gta_data_service.hpp

@@ -49,11 +49,11 @@ namespace big
 		{
 			return m_vehicles;
 		}
-		std::map<std::string, weapon_item_parsed>& weapons()
+		std::map<std::string, weapon_item>& weapons()
 		{
 			return m_weapons_cache.weapon_map;
 		}
-		std::map<std::string, weapon_component_parsed>& weapon_components()
+		std::map<std::string, weapon_component>& weapon_components()
 		{
 			return m_weapons_cache.weapon_components;
 		}
@@ -86,8 +86,6 @@ namespace big
 	private:
 		static constexpr ped_item empty_ped{};
 		static constexpr vehicle_item empty_vehicle{};
-		static constexpr weapon_item empty_weapon{};
-		static constexpr weapon_component empty_component{};
 	};
 
 	inline gta_data_service g_gta_data_service{};

src/services/gta_data/weapon_component.hpp

@@ -2,17 +2,14 @@
 
 namespace big
 {
-	class weapon_component
+	class weapon_component final
 	{
 	public:
 		std::string m_name;
 		Hash m_hash;
 		std::string m_display_name;
 		std::string m_display_desc;
-	};
 
-	class weapon_component_parsed : public weapon_component
-	{
 		NLOHMANN_DEFINE_TYPE_INTRUSIVE(weapon_component, m_name, m_hash, m_display_name, m_display_desc)
 	};
 }

src/services/gta_data/weapon_file.hpp

@@ -17,8 +17,8 @@ namespace big
 			NLOHMANN_DEFINE_TYPE_INTRUSIVE(version_info, m_game_build, m_online_version, m_file_version)
 		} version_info{};
 
-		std::map<std::string, weapon_item_parsed> weapon_map;
-		std::map<std::string, weapon_component_parsed> weapon_components;
+		std::map<std::string, weapon_item> weapon_map;
+		std::map<std::string, weapon_component> weapon_components;
 
 		NLOHMANN_DEFINE_TYPE_INTRUSIVE(weapon_file, version_info, weapon_map, weapon_components)
 

src/services/gta_data/weapon_item.hpp

@@ -22,13 +22,13 @@ namespace big
 		uint32_t m_reward_ammo_hash;
 		std::vector<std::string> m_attachments;
 		bool m_throwable;
+
+		NLOHMANN_DEFINE_TYPE_INTRUSIVE(weapon_item, m_name, m_display_name, m_weapon_type, m_hash, m_reward_hash, m_reward_ammo_hash, m_attachments, m_throwable)
 	};
 
 	class weapon_item_parsed : public weapon_item
 	{
 	public:
 		RPFDatafileSource rpf_file_type = RPFDatafileSource::UNKNOWN;
-
-		NLOHMANN_DEFINE_TYPE_INTRUSIVE(weapon_item, m_name, m_display_name, m_weapon_type, m_hash, m_reward_hash, m_reward_ammo_hash, m_attachments, m_throwable)
 	};
 }