From 37f3178d33ab77de064bcbf10b4b03ddb47cc979 Mon Sep 17 00:00:00 2001 From: Kae <80987908+Novaenia@users.noreply.github.com> Date: Thu, 5 Sep 2024 19:15:47 +1000 Subject: Network compatibility changes --- source/game/StarObject.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source/game/StarObject.cpp') diff --git a/source/game/StarObject.cpp b/source/game/StarObject.cpp index ece0b20..66f7917 100644 --- a/source/game/StarObject.cpp +++ b/source/game/StarObject.cpp @@ -118,8 +118,9 @@ Json Object::diskStore() const { return writeStoredData().setAll({{"name", m_config->name}, {"parameters", m_parameters.baseMap()}}); } -ByteArray Object::netStore() { +ByteArray Object::netStore(NetCompatibilityRules rules) { DataStreamBuffer ds; + ds.setStreamCompatibilityVersion(rules); ds.write(m_config->name); ds.write(m_parameters.baseMap()); return ds.takeData(); @@ -297,13 +298,12 @@ RectF Object::metaBoundBox() const { } } -pair Object::writeNetState(uint64_t fromVersion) { - DataStreamBuffer ds; - return m_netGroup.writeNetState(fromVersion); +pair Object::writeNetState(uint64_t fromVersion, NetCompatibilityRules rules) { + return m_netGroup.writeNetState(fromVersion, rules); } -void Object::readNetState(ByteArray delta, float interpolationTime) { - m_netGroup.readNetState(std::move(delta), interpolationTime); +void Object::readNetState(ByteArray data, float interpolationTime, NetCompatibilityRules rules) { + m_netGroup.readNetState(data, interpolationTime, rules); } Vec2I Object::tilePosition() const { -- cgit v1.2.3