diff options
author | zaaarf <80046572+zaaarf@users.noreply.github.com> | 2023-12-10 23:17:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-10 23:17:04 +0100 |
commit | 34fbe27857d77d6f193d6d1848b953a4596cedd2 (patch) | |
tree | 7f07835485b877f3c01c52c188892499e5812f9b /src/openvic-simulation/pop/Pop.hpp | |
parent | 1eb28bd4fb959b69a30013f6438f0257a2ee7b03 (diff) | |
parent | 4ef33d4df6198e613b0f27406d49978c8ea2fb97 (diff) |
Merge pull request #91 from OpenVicProject/registry-macro
Improved identifier registry macro
Diffstat (limited to 'src/openvic-simulation/pop/Pop.hpp')
-rw-r--r-- | src/openvic-simulation/pop/Pop.hpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/openvic-simulation/pop/Pop.hpp b/src/openvic-simulation/pop/Pop.hpp index fb51c59..736b77d 100644 --- a/src/openvic-simulation/pop/Pop.hpp +++ b/src/openvic-simulation/pop/Pop.hpp @@ -89,7 +89,7 @@ namespace OpenVic { struct PopManager { private: - IdentifierRegistry<PopType> pop_types; + IdentifierRegistry<PopType> IDENTIFIER_REGISTRY(pop_type); PopType::sprite_t PROPERTY(slave_sprite); PopType::sprite_t PROPERTY(administrative_sprite); @@ -107,7 +107,6 @@ namespace OpenVic { bool can_be_recruited, bool can_reduce_consciousness, bool administrative_efficiency, bool can_build, bool factory, bool can_work_factory, bool unemployment ); - IDENTIFIER_REGISTRY_ACCESSORS(pop_type) bool load_pop_type_file( std::string_view filestem, UnitManager const& unit_manager, GoodManager const& good_manager, ast::NodeCPtr root |