diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-07-23 19:47:47 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-07-23 19:47:47 +0200 |
| commit | 6cd55c452d1643666ff4169a89402fd3e3b66c61 (patch) | |
| tree | 888b847a54c66b6e9d1b2f7ee3e3d0f8071eceda /src/openvic-simulation/military/UnitInstanceGroup.hpp | |
| parent | 9d57ca273e4b32ab82a51789ec58e08fefb5276a (diff) | |
| parent | 67cbd14630c4344902d3fa1ddca178809da4293b (diff) | |
Merge pull request #177 from OpenVicProject/country-instance
Fleshing out Country, State and Province instances + history
Diffstat (limited to 'src/openvic-simulation/military/UnitInstanceGroup.hpp')
| -rw-r--r-- | src/openvic-simulation/military/UnitInstanceGroup.hpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/openvic-simulation/military/UnitInstanceGroup.hpp b/src/openvic-simulation/military/UnitInstanceGroup.hpp index 4fe0cba..78ff289 100644 --- a/src/openvic-simulation/military/UnitInstanceGroup.hpp +++ b/src/openvic-simulation/military/UnitInstanceGroup.hpp @@ -90,7 +90,7 @@ namespace OpenVic { friend struct UnitInstanceManager; private: - std::vector<ArmyInstance const*> PROPERTY(carried_armies); + std::vector<ArmyInstance*> PROPERTY(carried_armies); UnitInstanceGroupBranched( std::string_view new_name, @@ -99,6 +99,8 @@ namespace OpenVic { public: UnitInstanceGroupBranched(UnitInstanceGroupBranched&&) = default; + + fixed_point_t get_total_consumed_supply() const; }; using NavyInstance = UnitInstanceGroupBranched<UnitType::branch_t::NAVAL>; |