aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/military/UnitInstance.hpp
diff options
context:
space:
mode:
author Nemrav <>2024-09-17 18:44:23 +0200
committer Nemrav <>2024-09-17 18:44:23 +0200
commitc232250cc9819ae8bf165a5707a926db928dcb2b (patch)
tree1067808ef3d362ddae62b8d5994138434c5b7178 /src/openvic-simulation/military/UnitInstance.hpp
parentf090f8f33a41d8707795c8963fa67073ba90f554 (diff)
parentd8c04cbe53188d4717f8c49f918e01657dbf3440 (diff)
Merge branch 'master' into gfxobject
Diffstat (limited to 'src/openvic-simulation/military/UnitInstance.hpp')
-rw-r--r--src/openvic-simulation/military/UnitInstance.hpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/openvic-simulation/military/UnitInstance.hpp b/src/openvic-simulation/military/UnitInstance.hpp
index 5ff4503..ffbd37f 100644
--- a/src/openvic-simulation/military/UnitInstance.hpp
+++ b/src/openvic-simulation/military/UnitInstance.hpp
@@ -41,8 +41,11 @@ namespace OpenVic {
private:
Pop* PROPERTY(pop);
+ bool PROPERTY_CUSTOM_PREFIX(mobilised, is);
- UnitInstanceBranched(std::string_view new_name, RegimentType const& new_regiment_type, Pop* new_pop);
+ UnitInstanceBranched(
+ std::string_view new_name, RegimentType const& new_regiment_type, Pop* new_pop, bool new_mobilised)
+ ;
public:
UnitInstanceBranched(UnitInstanceBranched&&) = default;