diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-08-30 01:22:08 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-08-30 01:22:08 +0200 |
| commit | 68fca4f504e7f178f69d0dfd64e90ffb1d579322 (patch) | |
| tree | bedfa97590a31eb5f2871b7921e48423d1ddabde /src/openvic-simulation/pop | |
| parent | 5813948cd3ed6432de374664650d68afbff71915 (diff) | |
| parent | 172ad2fcc34b567eab9eca1f907cd99574fa031e (diff) | |
Merge pull request #187 from OpenVicProject/remove-asserts
Remove unnecessary asserts + make `vec2_t(T val)` constructor explicit
Diffstat (limited to 'src/openvic-simulation/pop')
| -rw-r--r-- | src/openvic-simulation/pop/Pop.cpp | 10 | ||||
| -rw-r--r-- | src/openvic-simulation/pop/Religion.cpp | 15 |
2 files changed, 11 insertions, 14 deletions
diff --git a/src/openvic-simulation/pop/Pop.cpp b/src/openvic-simulation/pop/Pop.cpp index c421de3..6dd0d1f 100644 --- a/src/openvic-simulation/pop/Pop.cpp +++ b/src/openvic-simulation/pop/Pop.cpp @@ -40,9 +40,7 @@ Pop::Pop(PopBase const& pop_base, decltype(ideologies)::keys_t const& ideology_k savings { 0 }, life_needs_fulfilled { 0 }, everyday_needs_fulfilled { 0 }, - luxury_needs_fulfilled { 0 } { - assert(size > 0); -} + luxury_needs_fulfilled { 0 } {} void Pop::setup_pop_test_values(IssueManager const& issue_manager) { /* Returns +/- range% of size. */ @@ -198,11 +196,7 @@ PopType::PopType( migration_target { std::move(new_migration_target) }, promote_to { std::move(new_promote_to) }, ideologies { std::move(new_ideologies) }, - issues { std::move(new_issues) } { - assert(sprite > 0); - assert(max_size >= 0); - assert(merge_max_size >= 0); -} + issues { std::move(new_issues) } {} bool PopType::parse_scripts(DefinitionManager const& definition_manager) { bool ret = true; diff --git a/src/openvic-simulation/pop/Religion.cpp b/src/openvic-simulation/pop/Religion.cpp index 3fa81bf..2283821 100644 --- a/src/openvic-simulation/pop/Religion.cpp +++ b/src/openvic-simulation/pop/Religion.cpp @@ -1,7 +1,5 @@ #include "Religion.hpp" -#include <cassert> - #include "openvic-simulation/types/Colour.hpp" using namespace OpenVic; @@ -10,10 +8,15 @@ using namespace OpenVic::NodeTools; ReligionGroup::ReligionGroup(std::string_view new_identifier) : HasIdentifier { new_identifier } {} Religion::Religion( - std::string_view new_identifier, colour_t new_colour, ReligionGroup const& new_group, icon_t new_icon, bool new_pagan -) : HasIdentifierAndColour { new_identifier, new_colour, false }, group { new_group }, icon { new_icon }, pagan { new_pagan } { - assert(icon > 0); -} + std::string_view new_identifier, + colour_t new_colour, + ReligionGroup const& new_group, + icon_t new_icon, + bool new_pagan +) : HasIdentifierAndColour { new_identifier, new_colour, false }, + group { new_group }, + icon { new_icon }, + pagan { new_pagan } {} bool ReligionManager::add_religion_group(std::string_view identifier) { if (identifier.empty()) { |