aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author ClarkeCode <clarke.john.robert@gmail.com>2023-04-29 01:44:43 +0200
committer ClarkeCode <clarke.john.robert@gmail.com>2023-04-29 01:44:43 +0200
commitef0d15bef9c35f261c4d09bbb23a2b8731acd3fc (patch)
tree0accf6d2c5479afb99649351ccf485b63520ac81
parent5195a460330af234391dfdc892847d74d0d29393 (diff)
Resolving merge conflicts
-rw-r--r--extension/src/openvic2/map/Map.hpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/extension/src/openvic2/map/Map.hpp b/extension/src/openvic2/map/Map.hpp
index a664d96..e5be9c7 100644
--- a/extension/src/openvic2/map/Map.hpp
+++ b/extension/src/openvic2/map/Map.hpp
@@ -28,7 +28,7 @@ namespace OpenVic2 {
struct Map {
#pragma pack(push, 1)
struct shape_pixel_t {
- Province::index_t index;
+ index_t index;
uint8_t terrain;
};
#pragma pack(pop)