aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/pop/Pop.hpp
diff options
context:
space:
mode:
author Hop311 <Hop3114@gmail.com>2023-09-29 01:03:54 +0200
committer GitHub <noreply@github.com>2023-09-29 01:03:54 +0200
commit04795924456062db1631686a90f13d963791ad34 (patch)
tree745235805b36eb98092c072fba884263d794dba5 /src/openvic-simulation/pop/Pop.hpp
parent5764126f4a3940320990a9bc3007ba22e89a514c (diff)
parent1e40569a49ab0d557a2a43ee900f4f28d5c81cd3 (diff)
Merge pull request #39 from OpenVicProject/cleanup
Cleanup
Diffstat (limited to 'src/openvic-simulation/pop/Pop.hpp')
-rw-r--r--src/openvic-simulation/pop/Pop.hpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/openvic-simulation/pop/Pop.hpp b/src/openvic-simulation/pop/Pop.hpp
index 85d4504..0ab3d06 100644
--- a/src/openvic-simulation/pop/Pop.hpp
+++ b/src/openvic-simulation/pop/Pop.hpp
@@ -60,7 +60,7 @@ namespace OpenVic {
// TODO - rebel composition, life/everyday/luxury needs, country and province migration targets, promote_to targets, ideologies and issues
- PopType(const std::string_view new_identifier, colour_t new_colour, strata_t new_strata, sprite_t new_sprite, Pop::pop_size_t new_max_size, Pop::pop_size_t new_merge_max_size,
+ PopType(std::string_view new_identifier, colour_t new_colour, strata_t new_strata, sprite_t new_sprite, Pop::pop_size_t new_max_size, Pop::pop_size_t new_merge_max_size,
bool new_state_capital_only, bool new_demote_migrant, bool new_is_artisan, bool new_is_slave);
public:
@@ -93,12 +93,12 @@ namespace OpenVic {
ReligionManager& get_religion_manager();
ReligionManager const& get_religion_manager() const;
- bool add_pop_type(const std::string_view identifier, colour_t new_colour, PopType::strata_t strata, PopType::sprite_t sprite,
+ bool add_pop_type(std::string_view identifier, colour_t new_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);
IDENTIFIER_REGISTRY_ACCESSORS(PopType, pop_type)
- bool load_pop_type_file(const std::string_view filestem, ast::NodeCPtr root);
- bool load_pop_into_province(Province& province, const std::string_view pop_type_identifier, ast::NodeCPtr pop_node) const;
+ bool load_pop_type_file(std::string_view filestem, ast::NodeCPtr root);
+ bool load_pop_into_province(Province& province, std::string_view pop_type_identifier, ast::NodeCPtr pop_node) const;
};
}