From 928c521599b2b18e8964aeb445c3ca5a55bacbd1 Mon Sep 17 00:00:00 2001
From: hop311 <hop3114@gmail.com>
Date: Wed, 17 Jul 2024 00:01:03 +0100
Subject: Use IndexedMap + helper function support

---
 extension/src/openvic-extension/singletons/ModelSingleton.hpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'extension/src/openvic-extension/singletons/ModelSingleton.hpp')

diff --git a/extension/src/openvic-extension/singletons/ModelSingleton.hpp b/extension/src/openvic-extension/singletons/ModelSingleton.hpp
index ad1a6d8..8030ffd 100644
--- a/extension/src/openvic-extension/singletons/ModelSingleton.hpp
+++ b/extension/src/openvic-extension/singletons/ModelSingleton.hpp
@@ -3,7 +3,8 @@
 #include <godot_cpp/classes/object.hpp>
 
 #include <openvic-simulation/interface/GFXObject.hpp>
-#include <openvic-simulation/military/UnitInstance.hpp>
+#include <openvic-simulation/military/UnitInstanceGroup.hpp>
+#include <openvic-simulation/types/OrderedContainers.hpp>
 
 namespace OpenVic {
 	struct BuildingInstance;
@@ -31,8 +32,10 @@ namespace OpenVic {
 		godot::Dictionary make_animation_dict(GFX::Actor::Animation const& animation) const;
 		godot::Dictionary make_model_dict(GFX::Actor const& actor) const;
 
-		template<utility::is_derived_from_specialization_of<UnitInstanceGroup> T>
-		bool add_unit_dict(ordered_set<T*> const& units, godot::TypedArray<godot::Dictionary>& unit_array) const;
+		template<UnitType::branch_t Branch>
+		bool add_unit_dict(
+			ordered_set<UnitInstanceGroupBranched<Branch>*> const& units, godot::TypedArray<godot::Dictionary>& unit_array
+		) const;
 
 		bool add_building_dict(
 			BuildingInstance const& building, ProvinceInstance const& province,
-- 
cgit v1.2.3-56-ga3b1