Merge pull request #187 from OpenVicProject/remove-asserts

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

1 files changed, 9 insertions, 6 deletions

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