From 212d591c31f4200b06d38e98b23c5c2bccde1772 Mon Sep 17 00:00:00 2001 From: Hop311 Date: Mon, 22 May 2023 10:26:37 +0100 Subject: Formatting / style cleanup --- src/openvic/map/Map.hpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/openvic/map/Map.hpp') diff --git a/src/openvic/map/Map.hpp b/src/openvic/map/Map.hpp index 39c37c0..a7c29bb 100644 --- a/src/openvic/map/Map.hpp +++ b/src/openvic/map/Map.hpp @@ -9,13 +9,15 @@ namespace OpenVic { struct Mapmode : HasIdentifier { friend struct Map; - using colour_func_t = std::function; + using colour_func_t = std::function; using index_t = size_t; + private: const index_t index; const colour_func_t colour_func; Mapmode(index_t new_index, std::string const& new_identifier, colour_func_t new_colour_func); + public: index_t get_index() const; colour_t get_colour(Map const& map, Province const& province) const; @@ -30,12 +32,12 @@ namespace OpenVic { using terrain_t = uint8_t; using terrain_variant_map_t = std::map; - #pragma pack(push, 1) +#pragma pack(push, 1) struct shape_pixel_t { index_t index; terrain_t terrain; }; - #pragma pack(pop) +#pragma pack(pop) private: using colour_index_map_t = std::map; @@ -51,6 +53,7 @@ namespace OpenVic { index_t selected_province = NULL_INDEX; index_t get_index_from_colour(colour_t colour) const; + public: Map(); -- cgit v1.2.3-56-ga3b1