From e25653b2ca360ee25a655427277c816a8eb7b537 Mon Sep 17 00:00:00 2001
From: wvpm <24685035+wvpm@users.noreply.github.com>
Date: Wed, 31 Jan 2024 20:08:49 +0100
Subject: draft for factory production

---
 src/openvic-simulation/pop/Pop.cpp | 4 ++--
 src/openvic-simulation/pop/Pop.hpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/openvic-simulation/pop')

diff --git a/src/openvic-simulation/pop/Pop.cpp b/src/openvic-simulation/pop/Pop.cpp
index 1701321..536459d 100644
--- a/src/openvic-simulation/pop/Pop.cpp
+++ b/src/openvic-simulation/pop/Pop.cpp
@@ -533,8 +533,8 @@ bool PopManager::load_pop_into_vector(
 		*non_integer_size = true;
 	}
 
-	if (culture != nullptr && religion != nullptr && size >= 1) {
-		vec.emplace_back(Pop { type, *culture, *religion, size.to_int64_t(), militancy, consciousness, rebel_type });
+	if (culture != nullptr && religion != nullptr && size >= 1 && size <= std::numeric_limits<Pop::pop_size_t>::max()) {
+		vec.emplace_back(Pop { type, *culture, *religion, size.to_int32_t(), militancy, consciousness, rebel_type });
 	} else {
 		Logger::warning(
 			"Some pop arguments are invalid: culture = ", culture, ", religion = ", religion, ", size = ", size
diff --git a/src/openvic-simulation/pop/Pop.hpp b/src/openvic-simulation/pop/Pop.hpp
index cdecf44..647d06d 100644
--- a/src/openvic-simulation/pop/Pop.hpp
+++ b/src/openvic-simulation/pop/Pop.hpp
@@ -30,7 +30,7 @@ namespace OpenVic {
 	struct Pop {
 		friend struct PopManager;
 
-		using pop_size_t = int64_t;
+		using pop_size_t = int32_t;
 
 		static constexpr pop_size_t MAX_SIZE = std::numeric_limits<pop_size_t>::max();
 
-- 
cgit v1.2.3-56-ga3b1