diff options
| author |   Hop311 <Hop3114@gmail.com> | 2023-11-17 10:19:53 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-11-17 10:19:53 +0100 |
| commit | e76336cd92639f4ec71088fc4c80aea4c25528cd (patch) | |
| tree | eeed419a7d97ecb58adf63a17eb9184db3e5ed7a /src/openvic-simulation/map/Region.hpp | |
| parent | a00b558a53edb40c9e6789790036f0b618e80ec1 (diff) | |
| parent | 886b8b8f396438fc2b7da7d2508f2064d14150a8 (diff) | |
Merge pull request #75 from OpenVicProject/accumulated-changes
Accumulated changes
Diffstat (limited to 'src/openvic-simulation/map/Region.hpp')
| -rw-r--r-- | src/openvic-simulation/map/Region.hpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/openvic-simulation/map/Region.hpp b/src/openvic-simulation/map/Region.hpp index 157b643..9119b93 100644 --- a/src/openvic-simulation/map/Region.hpp +++ b/src/openvic-simulation/map/Region.hpp @@ -28,7 +28,7 @@ namespace OpenVic { /* REQUIREMENTS: * MAP-6, MAP-44, MAP-48 */ - struct Region : HasIdentifier, ProvinceSet { + struct Region : HasIdentifierAndColour, ProvinceSet { friend struct Map; private: @@ -44,6 +44,5 @@ namespace OpenVic { Region(Region&&) = default; bool get_meta() const; - colour_t get_colour() const; }; } |