Better province image + terrain + some buttons

1 files changed, 2 insertions, 4 deletions

diff --git a/extension/src/MapSingleton.hpp b/extension/src/MapSingleton.hpp
index 9205e92..6ec2ea4 100644
--- a/extension/src/MapSingleton.hpp
+++ b/extension/src/MapSingleton.hpp
@@ -8,8 +8,6 @@
 
 namespace OpenVic2 {
 	class MapSingleton : public godot::Object {
-		using parse_json_entry_func_t = std::function<godot::Error (godot::String const&, godot::Variant const&)>;
-
 		GDCLASS(MapSingleton, godot::Object)
 
 		static MapSingleton* singleton;
@@ -18,8 +16,6 @@ namespace OpenVic2 {
 		Map map;
 		Mapmode::index_t mapmode_index = 0;
 
-		godot::Error parse_json_dictionary_file(godot::String const& file_description, godot::String const& file_path,
-			godot::String const& identifier_prefix, parse_json_entry_func_t parse_entry) const;
 		godot::Error _parse_province_identifier_entry(godot::String const& identifier, godot::Variant const& entry);
 		godot::Error _parse_region_entry(godot::String const& identifier, godot::Variant const& entry);
 	protected:
@@ -32,6 +28,7 @@ namespace OpenVic2 {
 		~MapSingleton();
 
 		godot::Error load_province_identifier_file(godot::String const& file_path);
+		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);
 
@@ -39,6 +36,7 @@ namespace OpenVic2 {
 		Province const* get_province_from_uv_coords(godot::Vector2 const& coords) const;
 		int32_t get_province_index_from_uv_coords(godot::Vector2 const& coords) const;
 		godot::String get_province_identifier_from_uv_coords(godot::Vector2 const& coords) const;
+		godot::String get_region_identifier_from_province_identifier(godot::String const& identifier) const;
 		int32_t get_width() const;
 		int32_t get_height() const;
 		godot::Ref<godot::Image> get_province_index_image() const;