From 112de0ac9c7ce26bd75d06e4cd3bc91adee716e3 Mon Sep 17 00:00:00 2001 From: Spartan322 Date: Sun, 23 Apr 2023 23:36:42 -0400 Subject: Support features up to clang-format 14 Add .editorconfig Update C++ files within `extension/src` to follow .clang-format --- extension/src/openvic2/map/Building.hpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'extension/src/openvic2/map/Building.hpp') diff --git a/extension/src/openvic2/map/Building.hpp b/extension/src/openvic2/map/Building.hpp index 78d08ae..492cbc6 100644 --- a/extension/src/openvic2/map/Building.hpp +++ b/extension/src/openvic2/map/Building.hpp @@ -2,8 +2,8 @@ #include -#include "../Types.hpp" #include "../Date.hpp" +#include "../Types.hpp" namespace OpenVic2 { struct Province; @@ -19,7 +19,13 @@ namespace OpenVic2 { using level_t = int8_t; - enum class ExpansionState { CannotExpand, CanExpand, Preparing, Expanding }; + enum class ExpansionState { + CannotExpand, + CanExpand, + Preparing, + Expanding + }; + private: BuildingType const& type; level_t level = 0; @@ -30,6 +36,7 @@ namespace OpenVic2 { Building(BuildingType const& new_type); bool _can_expand() const; + public: Building(Building&&) = default; @@ -49,11 +56,13 @@ namespace OpenVic2 { struct BuildingType : HasIdentifier { friend struct BuildingManager; + private: const Building::level_t max_level; const Timespan build_time; BuildingType(std::string const& new_identifier, Building::level_t new_max_level, Timespan new_build_time); + public: BuildingType(BuildingType&&) = default; @@ -64,6 +73,7 @@ namespace OpenVic2 { struct BuildingManager { private: IdentifierRegistry building_types; + public: BuildingManager(); -- cgit v1.2.3-56-ga3b1