diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-07-04 10:39:28 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-07-04 10:39:28 +0200 |
| commit | 6797e64ce8179635d56b73b5b4783eca560cbf11 (patch) | |
| tree | 0c06560ddae94550077c997f8b7e14f69057f236 /extension/src/openvic-extension/singletons/MenuSingleton.hpp | |
| parent | 5a35e5f511c6af55c63cc0303e05da2812ab21a8 (diff) | |
| parent | db246d901d1ccd39b0ed3fc024f28ad7b6b4848b (diff) | |
Merge pull request #235 from OpenVicProject/instance-definition-managers
Update to use SIM Instance and Definition Managers
Diffstat (limited to 'extension/src/openvic-extension/singletons/MenuSingleton.hpp')
| -rw-r--r-- | extension/src/openvic-extension/singletons/MenuSingleton.hpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/extension/src/openvic-extension/singletons/MenuSingleton.hpp b/extension/src/openvic-extension/singletons/MenuSingleton.hpp index efce81f..a3bcb67 100644 --- a/extension/src/openvic-extension/singletons/MenuSingleton.hpp +++ b/extension/src/openvic-extension/singletons/MenuSingleton.hpp @@ -6,7 +6,6 @@ #include <openvic-simulation/types/OrderedContainers.hpp> namespace OpenVic { - struct GameManager; struct State; class MenuSingleton : public godot::Object { @@ -14,8 +13,6 @@ namespace OpenVic { static inline MenuSingleton* singleton = nullptr; - GameManager* game_manager; - public: struct population_menu_t { enum ProvinceListEntry { @@ -113,7 +110,7 @@ namespace OpenVic { godot::String get_longform_date() const; /* POPULATION MENU */ - void _population_menu_update_provinces(); + bool _population_menu_update_provinces(); int32_t get_population_menu_province_list_row_count() const; godot::TypedArray<godot::Dictionary> get_population_menu_province_list_rows(int32_t start, int32_t count) const; godot::Error population_menu_select_province_list_entry(int32_t select_index, bool set_scroll_index = false); @@ -129,6 +126,7 @@ namespace OpenVic { godot::TypedArray<godot::Dictionary> get_population_menu_pop_rows(int32_t start, int32_t count) const; int32_t get_population_menu_pop_row_count() const; + bool _population_menu_generate_pop_filters(); godot::PackedInt32Array get_population_menu_pop_filter_setup_info(); godot::TypedArray<godot::Dictionary> get_population_menu_pop_filter_info() const; godot::Error population_menu_toggle_pop_filter(int32_t filter_index); |