aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/map/Province.hpp
diff options
context:
space:
mode:
author BrickPi <49528459+BrickPi@users.noreply.github.com>2023-12-04 23:03:34 +0100
committer hop311 <hop3114@gmail.com>2023-12-05 00:56:37 +0100
commit471d0c80ac0b62d7e5e538ccd921bf7c5c014307 (patch)
treec0411b2b6051bb274cc8d3fb39613fbd800df511 /src/openvic-simulation/map/Province.hpp
parent444a27726695478e44e0166e75df1f354b6432d5 (diff)
parente78249bea71e2503be77f9e4cfab6ffdf164126b (diff)
Merge pull request #79 from OpenVicProject/states
Diffstat (limited to 'src/openvic-simulation/map/Province.hpp')
-rw-r--r--src/openvic-simulation/map/Province.hpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/openvic-simulation/map/Province.hpp b/src/openvic-simulation/map/Province.hpp
index a57f914..dd440fa 100644
--- a/src/openvic-simulation/map/Province.hpp
+++ b/src/openvic-simulation/map/Province.hpp
@@ -10,6 +10,7 @@
namespace OpenVic {
struct Map;
struct Region;
+ struct State;
struct Good;
struct TerrainType;
struct TerrainTypeMapping;
@@ -27,7 +28,7 @@ namespace OpenVic {
using distance_t = uint16_t;
using flags_t = uint16_t;
- enum struct colony_status_t : int8_t { STATE, PROTECTORATE, COLONY };
+ enum struct colony_status_t : uint8_t { STATE, PROTECTORATE, COLONY };
struct adjacency_t {
friend struct Province;
@@ -62,6 +63,7 @@ namespace OpenVic {
private:
const index_t PROPERTY(index);
Region* PROPERTY(region);
+ State const* PROPERTY_RW(state);
bool PROPERTY(on_map);
bool PROPERTY(has_region);
bool PROPERTY(water);