aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/map/ProvinceInstance.hpp
diff options
context:
space:
mode:
author hop311 <hop3114@gmail.com>2024-06-07 00:20:58 +0200
committer hop311 <hop3114@gmail.com>2024-06-07 12:28:16 +0200
commit1198a780916e65cae048dd3478f614c1d18db846 (patch)
treef681dd2e76d489ba6e7beea44ae6ebd59e9d51f3 /src/openvic-simulation/map/ProvinceInstance.hpp
parentc94a06477fc3930e8f8f2e5f971fc4b5b838ea0d (diff)
Separated MapDefinition and MapInstancemap-instance
Diffstat (limited to 'src/openvic-simulation/map/ProvinceInstance.hpp')
-rw-r--r--src/openvic-simulation/map/ProvinceInstance.hpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/openvic-simulation/map/ProvinceInstance.hpp b/src/openvic-simulation/map/ProvinceInstance.hpp
index 2dbc4e3..3292575 100644
--- a/src/openvic-simulation/map/ProvinceInstance.hpp
+++ b/src/openvic-simulation/map/ProvinceInstance.hpp
@@ -7,6 +7,7 @@
#include "openvic-simulation/types/OrderedContainers.hpp"
namespace OpenVic {
+ struct MapInstance;
struct ProvinceDefinition;
struct TerrainType;
struct State;
@@ -24,7 +25,7 @@ namespace OpenVic {
struct IssueManager;
struct ProvinceInstance : HasIdentifier {
- friend struct Map;
+ friend struct MapInstance;
using life_rating_t = int8_t;
@@ -63,7 +64,7 @@ namespace OpenVic {
public:
ProvinceInstance(ProvinceInstance&&) = default;
- inline constexpr operator ProvinceDefinition const&() const {
+ inline explicit constexpr operator ProvinceDefinition const&() const {
return province_definition;
}