diff options
| author |   Hop311 <Hop3114@gmail.com> | 2023-10-29 21:14:55 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-10-29 21:14:55 +0100 |
| commit | 06cc0606156d009026930c785c62434276fbe782 (patch) | |
| tree | d37fcb69766ec029ea4e3e2816c419f9d7e05f7c /src/openvic-simulation/military/LeaderTrait.hpp | |
| parent | d8ec90f07342876e9331819bd3cc372050f78248 (diff) | |
| parent | 1b5e43fa7750cc4025d32f18390593cbce3ba842 (diff) | |
Merge pull request #67 from OpenVicProject/format
Formating
Diffstat (limited to 'src/openvic-simulation/military/LeaderTrait.hpp')
| -rw-r--r-- | src/openvic-simulation/military/LeaderTrait.hpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/openvic-simulation/military/LeaderTrait.hpp b/src/openvic-simulation/military/LeaderTrait.hpp index d885057..e61a1fc 100644 --- a/src/openvic-simulation/military/LeaderTrait.hpp +++ b/src/openvic-simulation/military/LeaderTrait.hpp @@ -14,13 +14,9 @@ namespace OpenVic { struct LeaderTrait : HasIdentifier { friend struct LeaderTraitManager; - enum class trait_type_t { - PERSONALITY, - BACKGROUND - }; + enum class trait_type_t { PERSONALITY, BACKGROUND }; private: - const trait_type_t type; /* * Allowed modifiers for leaders: @@ -51,15 +47,7 @@ namespace OpenVic { private: IdentifierRegistry<LeaderTrait> leader_traits; inline static const string_set_t allowed_modifiers = { - "attack", - "defence", - "morale", - "organisation", - "reconnaissance", - "speed", - "attrition", - "experience", - "reliability" + "attack", "defence", "morale", "organisation", "reconnaissance", "speed", "attrition", "experience", "reliability" }; public: |