Remove unnecessary asserts + make `vec2_t(T val)` constructor explicitremove-asserts

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()) {