Merge pull request #232 from OpenVicProject/province-const-mutable

Province const/mutable + proper State names

1 files changed, 5 insertions, 4 deletions

diff --git a/extension/src/openvic-extension/singletons/MenuSingleton.hpp b/extension/src/openvic-extension/singletons/MenuSingleton.hpp
index fd1b6c5..efce81f 100644
--- a/extension/src/openvic-extension/singletons/MenuSingleton.hpp
+++ b/extension/src/openvic-extension/singletons/MenuSingleton.hpp
@@ -7,7 +7,7 @@
 
 namespace OpenVic {
 	struct GameManager;
-	struct Region;
+	struct State;
 
 	class MenuSingleton : public godot::Object {
 		GDCLASS(MenuSingleton, godot::Object)
@@ -28,13 +28,12 @@ namespace OpenVic {
 			};
 
 			struct state_entry_t {
-				// TODO - change to State
-				Region const& state;
+				State const& state;
 				bool selected = true, expanded = false;
 			};
 
 			struct province_entry_t {
-				Province const& province;
+				ProvinceInstance const& province;
 				bool selected = true;
 			};
 
@@ -80,6 +79,8 @@ namespace OpenVic {
 		/* Emitted when the selected/filtered collection of pops changes. */
 		static godot::StringName const& _signal_population_menu_pops_changed();
 
+		godot::String get_state_name(State const& state) const;
+
 	protected:
 		static void _bind_methods();