diff options
author | Nemrav <> | 2024-09-17 18:44:23 +0200 |
---|---|---|
committer | Nemrav <> | 2024-09-17 18:44:23 +0200 |
commit | c232250cc9819ae8bf165a5707a926db928dcb2b (patch) | |
tree | 1067808ef3d362ddae62b8d5994138434c5b7178 /src/openvic-simulation/military/UnitInstance.cpp | |
parent | f090f8f33a41d8707795c8963fa67073ba90f554 (diff) | |
parent | d8c04cbe53188d4717f8c49f918e01657dbf3440 (diff) |
Merge branch 'master' into gfxobject
Diffstat (limited to 'src/openvic-simulation/military/UnitInstance.cpp')
-rw-r--r-- | src/openvic-simulation/military/UnitInstance.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvic-simulation/military/UnitInstance.cpp b/src/openvic-simulation/military/UnitInstance.cpp index d9f12b9..7c6488d 100644 --- a/src/openvic-simulation/military/UnitInstance.cpp +++ b/src/openvic-simulation/military/UnitInstance.cpp @@ -19,8 +19,8 @@ template struct OpenVic::UnitInstance<UnitType::branch_t::LAND>; template struct OpenVic::UnitInstance<UnitType::branch_t::NAVAL>; UnitInstanceBranched<UnitType::branch_t::LAND>::UnitInstanceBranched( - std::string_view new_name, RegimentType const& new_regiment_type, Pop* new_pop -) : UnitInstance { new_name, new_regiment_type }, pop { new_pop } {} + std::string_view new_name, RegimentType const& new_regiment_type, Pop* new_pop, bool new_mobilised +) : UnitInstance { new_name, new_regiment_type }, pop { new_pop }, mobilised { new_mobilised } {} UnitInstanceBranched<UnitType::branch_t::NAVAL>::UnitInstanceBranched( std::string_view new_name, ShipType const& new_ship_type |