diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-09-11 18:22:44 +1000 |
---|---|---|
committer | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-09-11 18:22:44 +1000 |
commit | 7408981e131f7cdd897a3c5924ea14b272986e88 (patch) | |
tree | 4e99c67e587aa7c1e9b4dbd046177efbc4ba4011 /source/game/StarStatusController.cpp | |
parent | 5a75473e16afb8152aab943fd316d9820835f465 (diff) |
use a version number rather than a bool
more flexible, allows for backwards compat with older OpenSB versions & not just vanilla Starbound
Diffstat (limited to 'source/game/StarStatusController.cpp')
-rw-r--r-- | source/game/StarStatusController.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/game/StarStatusController.cpp b/source/game/StarStatusController.cpp index a2a5e9c..325fc17 100644 --- a/source/game/StarStatusController.cpp +++ b/source/game/StarStatusController.cpp @@ -21,15 +21,15 @@ StatusController::StatusController(Json const& config) : m_statCollection(config m_statusProperties.reset(config.getObject("statusProperties", {})); m_statusProperties.setOverrides( [&](DataStream& ds, NetCompatibilityRules rules) { - if (rules.isLegacy) ds << m_statusProperties.baseMap(); + if (rules.version() <= 1) ds << m_statusProperties.baseMap(); else m_statusProperties.NetElementHashMap<String, Json>::netStore(ds, rules); }, [&](DataStream& ds, NetCompatibilityRules rules) { - if (rules.isLegacy) m_statusProperties.reset(ds.read<JsonObject>()); + if (rules.version() <= 1) m_statusProperties.reset(ds.read<JsonObject>()); else m_statusProperties.NetElementHashMap<String, Json>::netLoad(ds, rules); }, [&](DataStream& ds, uint64_t fromVersion, NetCompatibilityRules rules) { - if (rules.isLegacy) { + if (rules.version() <= 1) { if (m_statusProperties.shouldWriteNetDelta(fromVersion, rules)) { ds << m_statusProperties.baseMap(); return true; @@ -39,7 +39,7 @@ StatusController::StatusController(Json const& config) : m_statCollection(config return m_statusProperties.NetElementHashMap<String, Json>::writeNetDelta(ds, fromVersion, rules); }, [&](DataStream& ds, float interp, NetCompatibilityRules rules) { - if (rules.isLegacy) m_statusProperties.reset(ds.read<JsonObject>()); + if (rules.version() <= 1) m_statusProperties.reset(ds.read<JsonObject>()); else m_statusProperties.NetElementHashMap<String, Json>::readNetDelta(ds, interp, rules); } ); |