diff options
| author |   Hop311 <Hop3114@gmail.com> | 2023-04-26 01:26:33 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-04-26 01:26:33 +0200 |
| commit | 10053cf259c55ee45803268a844edf1011d8a16b (patch) | |
| tree | fcf86e6fac31430ba537a0d056e97f901ad76dd7 /extension/src/GameSingleton.hpp | |
| parent | 639f86febf39184cccde9f898fc328375048233f (diff) | |
| parent | 563834e7e6f9ce565bbfd553a0d9ff80a98c677d (diff) | |
Merge pull request #98 from OpenVic2Project/some-cleanup
Req comments + cleanup + c++ registry refactoring
Diffstat (limited to 'extension/src/GameSingleton.hpp')
| -rw-r--r-- | extension/src/GameSingleton.hpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/extension/src/GameSingleton.hpp b/extension/src/GameSingleton.hpp index 0e2cfd1..d9879ef 100644 --- a/extension/src/GameSingleton.hpp +++ b/extension/src/GameSingleton.hpp @@ -14,7 +14,8 @@ namespace OpenVic2 { GameManager game_manager; - godot::Ref<godot::Image> province_index_image, province_colour_image; + static constexpr int image_width_divide = 2; + godot::Ref<godot::Image> province_index_image[image_width_divide], province_colour_image; Mapmode::index_t mapmode_index = 0; godot::Error _parse_province_identifier_entry(godot::String const& identifier, godot::Variant const& entry); @@ -33,13 +34,13 @@ namespace OpenVic2 { godot::Error load_water_province_file(godot::String const& file_path); godot::Error load_region_file(godot::String const& file_path); godot::Error load_province_shape_file(godot::String const& file_path); - void finished_loading_data(); + godot::Error setup(); int32_t get_province_index_from_uv_coords(godot::Vector2 const& coords) const; godot::Dictionary get_province_info_from_index(int32_t index) const; int32_t get_width() const; int32_t get_height() const; - godot::Ref<godot::Image> get_province_index_image() const; + godot::Array get_province_index_images() const; godot::Ref<godot::Image> get_province_colour_image() const; godot::Error update_colour_image(); |