From 2cdbcea72762822adedf948f43a61d38472b5c7d Mon Sep 17 00:00:00 2001
From: hop311 <hop3114@gmail.com>
Date: Tue, 19 Nov 2024 16:26:51 +0000
Subject: Update to OpenVic-Simulation@dda680c

---
 .../src/openvic-extension/singletons/MenuSingleton.cpp     |  2 +-
 .../src/openvic-extension/singletons/MenuSingleton.hpp     | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'extension/src/openvic-extension/singletons')

diff --git a/extension/src/openvic-extension/singletons/MenuSingleton.cpp b/extension/src/openvic-extension/singletons/MenuSingleton.cpp
index 81582c2..e5554c3 100644
--- a/extension/src/openvic-extension/singletons/MenuSingleton.cpp
+++ b/extension/src/openvic-extension/singletons/MenuSingleton.cpp
@@ -482,7 +482,7 @@ Dictionary MenuSingleton::get_province_info_from_index(int32_t index) const {
 	ret[province_info_rgo_output_quantity_yesterday_key] = rgo.get_output_quantity_yesterday().to_float();
 	ret[province_info_rgo_revenue_yesterday_key] = rgo.get_revenue_yesterday().to_float();
 	ret[province_info_rgo_total_employees_key] = rgo.get_total_employees_count_cache();
-	const Pop::pop_size_t max_employee_count = rgo.get_max_employee_count_cache();
+	const pop_size_t max_employee_count = rgo.get_max_employee_count_cache();
 	if (max_employee_count == 0) {
 		ret[province_info_rgo_employment_percentage_key] = 100.0f;
 	} else {
diff --git a/extension/src/openvic-extension/singletons/MenuSingleton.hpp b/extension/src/openvic-extension/singletons/MenuSingleton.hpp
index 0dcc8ff..169d519 100644
--- a/extension/src/openvic-extension/singletons/MenuSingleton.hpp
+++ b/extension/src/openvic-extension/singletons/MenuSingleton.hpp
@@ -1,16 +1,26 @@
 #pragma once
 
+#include <variant>
+
 #include <godot_cpp/classes/control.hpp>
 #include <godot_cpp/classes/image.hpp>
 
-#include <openvic-simulation/pop/Pop.hpp>
 #include <openvic-simulation/types/IndexedMap.hpp>
+#include <openvic-simulation/types/PopSize.hpp>
 #include <openvic-simulation/types/OrderedContainers.hpp>
 
 namespace OpenVic {
 	struct CountryInstance;
 	struct State;
 	struct ProvinceInstance;
+	struct Pop;
+	struct PopType;
+	struct Religion;
+	struct Ideology;
+	struct Culture;
+	struct Issue;
+	struct CountryParty;
+	struct RebelType;
 	struct ModifierValue;
 	struct RuleSet;
 
@@ -46,7 +56,7 @@ namespace OpenVic {
 			int32_t visible_province_list_entries = 0;
 
 			struct pop_filter_t {
-				Pop::pop_size_t count, promotion_demotion_change;
+				pop_size_t count, promotion_demotion_change;
 				bool selected;
 			};
 			ordered_map<PopType const*, pop_filter_t> pop_filters;
-- 
cgit v1.2.3-56-ga3b1