From 4c5d17bc8e6fceeb6fd9cc45c10f07b7bc639f49 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Wed, 25 Sep 2024 18:21:09 +0200 Subject: core: add "is-" prefix to "::active" and "::defeated" --- core/src/participant.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'core/src') diff --git a/core/src/participant.cpp b/core/src/participant.cpp index 3aadc80..b607794 100644 --- a/core/src/participant.cpp +++ b/core/src/participant.cpp @@ -23,15 +23,13 @@ namespace turns::core auto participant::create(nlohmann::json const & serialized) -> Glib::RefPtr { - auto active = serialized.value("active", false); auto disposition = serialized.value("disposition", disposition::neutral); auto priority = serialized.value("priority", 0.0f); auto name = serialized.value("name", std::string{}); - auto defeated = serialized.value("defeated", false); auto instance = create(name, priority, disposition); - instance->defeated() = defeated; - instance->is_active() = active; + instance->is_active() = serialized.value("is-active", false); + instance->is_defeated() = serialized.value("is-defeated", false);; return instance; } @@ -58,9 +56,9 @@ namespace turns::core auto participant::serialize() -> nlohmann::json { return nlohmann::json{ - {"active", m_is_active }, - {"defeated", m_defeated }, {"disposition", m_disposition}, + {"is-active", m_is_active }, + {"is-defeated", m_is_defeated}, {"name", m_name }, {"priority", m_priority }, }; -- cgit v1.2.3