diff options
Diffstat (limited to 'src/openvic-simulation/diplomacy')
| -rw-r--r-- | src/openvic-simulation/diplomacy/DiplomaticAction.cpp | 4 | ||||
| -rw-r--r-- | src/openvic-simulation/diplomacy/DiplomaticAction.hpp | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/openvic-simulation/diplomacy/DiplomaticAction.cpp b/src/openvic-simulation/diplomacy/DiplomaticAction.cpp index 41c0aa2..721411f 100644 --- a/src/openvic-simulation/diplomacy/DiplomaticAction.cpp +++ b/src/openvic-simulation/diplomacy/DiplomaticAction.cpp @@ -13,9 +13,7 @@ DiplomaticActionType::DiplomaticActionType(DiplomaticActionType::Initializer&& i get_acceptance { std::move(initializer.get_acceptance) } {} CancelableDiplomaticActionType::CancelableDiplomaticActionType(CancelableDiplomaticActionType::Initializer&& initializer) - : allowed_to_cancel { std::move(initializer.allowed_cancel) }, DiplomaticActionType(std::move(initializer)) {} - -DiplomaticActionManager::DiplomaticActionManager() {} + : allowed_to_cancel { std::move(initializer.allowed_cancel) }, DiplomaticActionType { std::move(initializer) } {} bool DiplomaticActionManager::add_diplomatic_action( std::string_view identifier, DiplomaticActionType::Initializer&& initializer diff --git a/src/openvic-simulation/diplomacy/DiplomaticAction.hpp b/src/openvic-simulation/diplomacy/DiplomaticAction.hpp index cf93c75..281707b 100644 --- a/src/openvic-simulation/diplomacy/DiplomaticAction.hpp +++ b/src/openvic-simulation/diplomacy/DiplomaticAction.hpp @@ -123,7 +123,7 @@ namespace OpenVic { IdentifierRegistry<DiplomaticActionTypeStorage> IDENTIFIER_REGISTRY(diplomatic_action_type); public: - DiplomaticActionManager(); + DiplomaticActionManager() = default; bool add_diplomatic_action(std::string_view identifier, DiplomaticActionType::Initializer&& initializer); bool add_cancelable_diplomatic_action( |