From 77e5a187842dae2317c07aef0d289c07775cb547 Mon Sep 17 00:00:00 2001 From: Pcornat Date: Sun, 1 Dec 2024 12:48:12 +0100 Subject: [PATCH] Cosmetic --- include/billy_objects.hpp | 8 ++------ src/billy_objects.cpp | 6 +++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/include/billy_objects.hpp b/include/billy_objects.hpp index f20b9ec..c675a52 100644 --- a/include/billy_objects.hpp +++ b/include/billy_objects.hpp @@ -46,13 +46,9 @@ namespace character { static std::string_view billy_object_to_string(const billyObjects &object) noexcept; - static void to_json(json &j, const BillyObjects::container &billy); + static void to_json(json &j, const container &billy); - static void from_json(const json &j, BillyObjects::container &billy); - - BillyObjects() noexcept = default; - - ~BillyObjects() noexcept = default; + static void from_json(const json &j, container &billy); [[nodiscard]] bool insert_object(CharacterSheet &sheet, const billyEnums objType) noexcept; diff --git a/src/billy_objects.cpp b/src/billy_objects.cpp index d1eb30d..0cf0bdb 100644 --- a/src/billy_objects.cpp +++ b/src/billy_objects.cpp @@ -3,7 +3,7 @@ #include "character_sheet.hpp" #include -std::uint32_t constexpr const_hash(const char *input) { +constexpr std::uint32_t const_hash(const char *input) { return *input ? static_cast(*input) + 33 * const_hash(input + 1) : 5381; } @@ -104,7 +104,7 @@ namespace character { return object->to_string(); } - void BillyObjects::from_json(const json &j, BillyObjects::container &billy) { + void BillyObjects::from_json(const json &j, container &billy) { for (const auto &element: j) { const std::uint32_t key = element[0].get(); const std::uint8_t value = element[1].get(); @@ -123,7 +123,7 @@ namespace character { } } - void BillyObjects::to_json(json &j, const BillyObjects::container &billy) { + void BillyObjects::to_json(json &j, const container &billy) { for (const auto &[object_type, _]: billy) { std::visit(overloaded{ [&j](const weapons weapon) {