From 005a8026bb424779a146e00cc48621ff1d72b807 Mon Sep 17 00:00:00 2001 From: CptAlanSmith <123112708+CptAlanSmith@users.noreply.github.com> Date: Sat, 23 Sep 2023 19:25:15 +0100 Subject: Testing (#23) * Fixes for building scons * Initial proof of concept auto-testing Shows how we can pull loaded data and display it back * Re-did headless Because hubert insisted it be done like this ;) * Auto-Testing Framework Basics * Requirements Calculations * Fix for messy merge (teach me to use merge tools) * Fixing up misc merge issues to fully reconcile with master changes * Re-added missing getters * Move of testing files due to folder reorgs * Use new accessors + int reading fix --------- Co-authored-by: Hop311 --- src/openvic-simulation/pop/Pop.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/openvic-simulation/pop/Pop.cpp') diff --git a/src/openvic-simulation/pop/Pop.cpp b/src/openvic-simulation/pop/Pop.cpp index 96b17fc..d74c6cf 100644 --- a/src/openvic-simulation/pop/Pop.cpp +++ b/src/openvic-simulation/pop/Pop.cpp @@ -101,6 +101,22 @@ bool PopType::get_is_slave() const { PopManager::PopManager() : pop_types { "pop types" } {} +CultureManager& PopManager::get_culture_manager() { + return culture_manager; +} + +CultureManager const& PopManager::get_culture_manager() const { + return culture_manager; +} + +ReligionManager& PopManager::get_religion_manager() { + return religion_manager; +} + +ReligionManager const& PopManager::get_religion_manager() const { + return religion_manager; +} + bool PopManager::add_pop_type(const std::string_view identifier, colour_t colour, PopType::strata_t strata, PopType::sprite_t sprite, Pop::pop_size_t max_size, Pop::pop_size_t merge_max_size, bool state_capital_only, bool demote_migrant, bool is_artisan, bool is_slave) { if (identifier.empty()) { -- cgit v1.2.3-56-ga3b1