From 244a669311edc5136aaa730b31ef64fd9d56879d Mon Sep 17 00:00:00 2001 From: Hop311 Date: Fri, 28 Jul 2023 14:18:33 +0100 Subject: First pass at pops (test pops and density mapmode) --- extension/src/GameSingleton.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'extension/src/GameSingleton.hpp') diff --git a/extension/src/GameSingleton.hpp b/extension/src/GameSingleton.hpp index 6c91de5..23eb334 100644 --- a/extension/src/GameSingleton.hpp +++ b/extension/src/GameSingleton.hpp @@ -7,20 +7,19 @@ namespace OpenVic { struct TerrainVariant : HasIdentifier, HasColour { + friend class GameSingleton; + private: const godot::Ref image; + TerrainVariant(std::string const& new_identfier, colour_t new_colour, + godot::Ref const& new_image); public: static constexpr size_t MAX_INDEX = 1 << (8 * sizeof(Map::terrain_t)); - TerrainVariant(std::string const& new_identfier, colour_t new_colour, - godot::Ref const& new_image) - : HasIdentifier { new_identfier }, - HasColour { new_colour }, - image { new_image } {} TerrainVariant(TerrainVariant&&) = default; - godot::Ref get_image() const { return image; } + godot::Ref get_image() const; }; class GameSingleton : public godot::Object { GDCLASS(GameSingleton, godot::Object) @@ -106,6 +105,7 @@ namespace OpenVic { static godot::StringName const& get_province_info_province_key(); static godot::StringName const& get_province_info_region_key(); static godot::StringName const& get_province_info_life_rating_key(); + static godot::StringName const& get_province_info_total_population_key(); static godot::StringName const& get_province_info_rgo_key(); static godot::StringName const& get_province_info_buildings_key(); -- cgit v1.2.3-56-ga3b1