diff options
author | Hop311 <hop3114@gmail.com> | 2023-09-15 23:26:46 +0200 |
---|---|---|
committer | Hop311 <hop3114@gmail.com> | 2023-09-23 20:29:26 +0200 |
commit | 6e2ba19d77c36ddc4767a20de040489b574ae0c3 (patch) | |
tree | 41aacf220a1f7085c81f2b0f522ad9f36991947b /extension/src/openvic-extension/LoadGameOpenVic.cpp | |
parent | 077554daf5ec8a92ed68fb97020e88dbfb0ea29f (diff) |
Preparation for interface loading
Diffstat (limited to 'extension/src/openvic-extension/LoadGameOpenVic.cpp')
-rw-r--r-- | extension/src/openvic-extension/LoadGameOpenVic.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extension/src/openvic-extension/LoadGameOpenVic.cpp b/extension/src/openvic-extension/LoadGameOpenVic.cpp index 87c66da..c34411c 100644 --- a/extension/src/openvic-extension/LoadGameOpenVic.cpp +++ b/extension/src/openvic-extension/LoadGameOpenVic.cpp @@ -86,7 +86,7 @@ Error GameSingleton::_load_map_images(String const& province_image_path, String if (err != OK) return err; // Generate interleaved province and terrain ID image - if (!game_manager.map.generate_province_shape_image(province_dims.x, province_dims.y, + if (!game_manager.get_map().generate_province_shape_image(province_dims.x, province_dims.y, province_image->get_data().ptr(), terrain_image->get_data().ptr(), terrain_variant_map, false /* <-- whether to print detailed map errors or not (specific missing/unrecognised colours) */ )) err = FAILED; @@ -97,7 +97,7 @@ Error GameSingleton::_load_map_images(String const& province_image_path, String for (image_subdivisions[i] = 1; province_dims[i] / image_subdivisions[i] > GPU_DIM_LIMIT || province_dims[i] % image_subdivisions[i] != 0; ++image_subdivisions[i]); - Map::shape_pixel_t const* province_shape_data = game_manager.map.get_province_shape_image().data(); + Map::shape_pixel_t const* province_shape_data = game_manager.get_map().get_province_shape_image().data(); const Vector2i divided_dims = province_dims / image_subdivisions; Array province_shape_images; province_shape_images.resize(image_subdivisions.x * image_subdivisions.y); |