diff options
Diffstat (limited to 'src/openvic-simulation/map/Mapmode.hpp')
| -rw-r--r-- | src/openvic-simulation/map/Mapmode.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/openvic-simulation/map/Mapmode.hpp b/src/openvic-simulation/map/Mapmode.hpp index fa306e9..d514f7a 100644 --- a/src/openvic-simulation/map/Mapmode.hpp +++ b/src/openvic-simulation/map/Mapmode.hpp @@ -8,7 +8,7 @@ namespace OpenVic { struct MapmodeManager; - struct Map; + struct MapInstance; struct ProvinceInstance; struct Mapmode : HasIdentifier { @@ -23,7 +23,7 @@ namespace OpenVic { : base_colour { base }, stripe_colour { stripe } {} constexpr base_stripe_t(colour_argb_t both) : base_stripe_t { both, both } {} }; - using colour_func_t = std::function<base_stripe_t(Map const&, ProvinceInstance const&)>; + using colour_func_t = std::function<base_stripe_t(MapInstance const&, ProvinceInstance const&)>; using index_t = size_t; private: @@ -37,7 +37,7 @@ namespace OpenVic { Mapmode(Mapmode&&) = default; - base_stripe_t get_base_stripe_colours(Map const& map, ProvinceInstance const& province) const; + base_stripe_t get_base_stripe_colours(MapInstance const& map_instance, ProvinceInstance const& province) const; }; struct MapmodeManager { @@ -54,7 +54,7 @@ namespace OpenVic { * and A = 255 is fully the RGB colour packaged with A. The base and stripe colours for each province are packed * together adjacently, so each province's entry is 8 bytes long. The list contains ProvinceDefinition::MAX_INDEX + 1 * entries, that is the maximum allowed number of provinces plus one for the index-zero "null province". */ - bool generate_mapmode_colours(Map const& map, Mapmode::index_t index, uint8_t* target) const; + bool generate_mapmode_colours(MapInstance const& map_instance, Mapmode::index_t index, uint8_t* target) const; bool setup_mapmodes(); }; |