diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-09-20 23:17:41 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-09-20 23:17:41 +0200 |
| commit | 4d8148a3a06df6b93685222ff3d8f1f9b54c734e (patch) | |
| tree | b00fced178ac9b0bf902187372c67efc2b2023a3 /extension/src/openvic-extension/singletons/MenuSingleton.hpp | |
| parent | 05c37434775fb879ac6f929ec90e1e9ae610d032 (diff) | |
| parent | 10e1a79f30dae8d2def820542b53596c2bfd222d (diff) | |
Merge pull request #275 from OpenVicProject/concept-pie-charts
Allow GFXPieChartTexture to use any distribution with identifiers and colours rather than just those derived from HasIdentifierAndColour
Diffstat (limited to 'extension/src/openvic-extension/singletons/MenuSingleton.hpp')
| -rw-r--r-- | extension/src/openvic-extension/singletons/MenuSingleton.hpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/extension/src/openvic-extension/singletons/MenuSingleton.hpp b/extension/src/openvic-extension/singletons/MenuSingleton.hpp index 97a6956..0dcc8ff 100644 --- a/extension/src/openvic-extension/singletons/MenuSingleton.hpp +++ b/extension/src/openvic-extension/singletons/MenuSingleton.hpp @@ -59,7 +59,12 @@ namespace OpenVic { * - Nationality (Culture) * - Issues * - Vote */ - std::array<fixed_point_map_t<HasIdentifierAndColour const*>, DISTRIBUTION_COUNT> distributions; + fixed_point_map_t<PopType const*> workforce_distribution; + fixed_point_map_t<Religion const*> religion_distribution; + fixed_point_map_t<Ideology const*> ideology_distribution; + fixed_point_map_t<Culture const*> culture_distribution; + fixed_point_map_t<Issue const*> issue_distribution; + fixed_point_map_t<CountryParty const*> vote_distribution; enum PopSortKey { NONE, SORT_SIZE, SORT_TYPE, SORT_CULTURE, SORT_RELIGION, SORT_LOCATION, SORT_MILITANCY, SORT_CONSCIOUSNESS, |