From 03647d2249f72b6545628bb844685f87c4581062 Mon Sep 17 00:00:00 2001 From: hop311 Date: Fri, 19 Jul 2024 19:02:25 +0100 Subject: Cleanup: inheritance, const movable variables, code formatting --- src/openvic-simulation/diplomacy/DiplomaticAction.cpp | 4 +--- src/openvic-simulation/diplomacy/DiplomaticAction.hpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/openvic-simulation/diplomacy') 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 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( -- cgit v1.2.3-56-ga3b1