aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/military
diff options
context:
space:
mode:
author Hop311 <Hop3114@gmail.com>2024-08-14 00:22:01 +0200
committer GitHub <noreply@github.com>2024-08-14 00:22:01 +0200
commit53bf0ac14be0fd7a049306d6e20c01030916fdc6 (patch)
treeb85022a240a4a24c0ee0fd44cd59ff6bc112c18f /src/openvic-simulation/military
parent9f9c5844bfedc5e366a35cdba386027fb9f3a14a (diff)
parent7e05aaccf0e13299702ddeed17661831c3ddc692 (diff)
Merge pull request #185 from OpenVicProject/assorted-fixes
Assorted minor fixes (clang-format.sh shebang, parse national foci sc…
Diffstat (limited to 'src/openvic-simulation/military')
-rw-r--r--src/openvic-simulation/military/UnitInstanceGroup.cpp1
-rw-r--r--src/openvic-simulation/military/UnitType.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/openvic-simulation/military/UnitInstanceGroup.cpp b/src/openvic-simulation/military/UnitInstanceGroup.cpp
index 07736f3..65ecf5b 100644
--- a/src/openvic-simulation/military/UnitInstanceGroup.cpp
+++ b/src/openvic-simulation/military/UnitInstanceGroup.cpp
@@ -155,7 +155,6 @@ UnitInstanceGroupBranched<UnitType::branch_t::NAVAL>::UnitInstanceGroupBranched(
std::vector<ShipInstance*>&& new_units
) : UnitInstanceGroup { new_name, std::move(new_units) } {}
-
fixed_point_t UnitInstanceGroupBranched<UnitType::branch_t::NAVAL>::get_total_consumed_supply() const {
fixed_point_t total_consumed_supply = 0;
diff --git a/src/openvic-simulation/military/UnitType.cpp b/src/openvic-simulation/military/UnitType.cpp
index fb65bf8..11f7221 100644
--- a/src/openvic-simulation/military/UnitType.cpp
+++ b/src/openvic-simulation/military/UnitType.cpp
@@ -151,7 +151,7 @@ bool UnitTypeManager::load_unit_type_file(
) {
using namespace std::string_view_literals;
auto type_symbol = parser.find_intern("type"sv);
- if(!type_symbol) {
+ if (!type_symbol) {
Logger::error("type could not be interned.");
}