diff options
| author |   Hop311 <hop3114@gmail.com> | 2023-09-14 09:52:08 +0200 |
|---|---|---|
| committer | Hop311 <hop3114@gmail.com> | 2023-09-14 09:52:08 +0200 |
| commit | 9dc8c3c89a86b8be2084890f3207adc6c9cda496 (patch) | |
| tree | af5fcc9e7122813446318957a66da940d09b6f36 /extension/src/GameSingleton.hpp | |
| parent | c715187bffa8c84428acf3631e3d03c088a719d9 (diff) | |
Move province csv load to SIM + remove return_t
Diffstat (limited to 'extension/src/GameSingleton.hpp')
| -rw-r--r-- | extension/src/GameSingleton.hpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/extension/src/GameSingleton.hpp b/extension/src/GameSingleton.hpp index eb332f4..ac9d160 100644 --- a/extension/src/GameSingleton.hpp +++ b/extension/src/GameSingleton.hpp @@ -3,8 +3,8 @@ #include <godot_cpp/classes/image_texture.hpp> #include <godot_cpp/classes/texture2d_array.hpp> -#include "openvic/GameManager.hpp" -#include "openvic/dataloader/Dataloader.hpp" +#include "openvic-simulation/GameManager.hpp" +#include "openvic-simulation/dataloader/Dataloader.hpp" namespace OpenVic { @@ -46,7 +46,6 @@ namespace OpenVic { godot::Error _generate_terrain_texture_array(); godot::Error _load_map_images(godot::String const& province_image_path, godot::String const& terrain_image_path, bool flip_vertical = false); - godot::Error _load_province_identifier_file_compatibility_mode(godot::String const& file_path); godot::Error _load_terrain_variants_compatibility_mode(godot::String const& terrain_image_path, godot::String const& terrain_texturesheet_path); /* Generate the province_colour_texture from the current mapmode. |