diff options
| author |   ClarkeCode <33846391+ClarkeCode@users.noreply.github.com> | 2023-04-29 03:39:28 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-04-29 03:39:28 +0200 |
| commit | 1f8545facd248bbf4ea0cd551fea5f7d9b0efdce (patch) | |
| tree | 0accf6d2c5479afb99649351ccf485b63520ac81 /extension/src/openvic2/map/Province.hpp | |
| parent | 05937359e8c53ee76dc3ce537dd70083a016f766 (diff) | |
| parent | ef0d15bef9c35f261c4d09bbb23a2b8731acd3fc (diff) | |
Merge pull request #100 from OpenVic2Project/goods
Addition of goods struct
Diffstat (limited to 'extension/src/openvic2/map/Province.hpp')
| -rw-r--r-- | extension/src/openvic2/map/Province.hpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/extension/src/openvic2/map/Province.hpp b/extension/src/openvic2/map/Province.hpp index aa0329c..65eaa09 100644 --- a/extension/src/openvic2/map/Province.hpp +++ b/extension/src/openvic2/map/Province.hpp @@ -1,6 +1,7 @@ #pragma once #include "openvic2/map/Building.hpp" +#include "openvic2/Types.hpp" namespace OpenVic2 { struct Map; @@ -9,18 +10,13 @@ namespace OpenVic2 { /* REQUIREMENTS: * MAP-5, MAP-8, MAP-43, MAP-47 */ - struct Province : HasIdentifier { + struct Province : HasIdentifier, HasColour { friend struct Map; - using colour_t = uint32_t; - using index_t = uint16_t; using life_rating_t = int8_t; - static constexpr colour_t NULL_COLOUR = 0, MAX_COLOUR = 0xFFFFFF; - static constexpr index_t NULL_INDEX = 0, MAX_INDEX = 0xFFFF; private: const index_t index; - const colour_t colour; Region* region = nullptr; bool water = false; life_rating_t life_rating = 0; @@ -28,12 +24,9 @@ namespace OpenVic2 { Province(index_t new_index, std::string const& new_identifier, colour_t new_colour); public: - static std::string colour_to_hex_string(colour_t colour); - Province(Province&&) = default; index_t get_index() const; - colour_t get_colour() const; Region* get_region() const; bool is_water() const; life_rating_t get_life_rating() const; |