Network compatibility changes

1 files changed, 28 insertions, 13 deletions

diff --git a/source/core/StarNetElementGroup.cpp b/source/core/StarNetElementGroup.cpp
index 249c978..6626e2b 100644
--- a/source/core/StarNetElementGroup.cpp
+++ b/source/core/StarNetElementGroup.cpp
@@ -21,14 +21,18 @@ void NetElementGroup::initNetVersion(NetElementVersion const* version) {
     p.first->initNetVersion(m_version);
 }
 
-void NetElementGroup::netStore(DataStream& ds) const {
+void NetElementGroup::netStore(DataStream& ds, NetCompatibilityRules rules) const {
+  if (!checkWithRules(rules)) return;
   for (auto& p : m_elements)
-    p.first->netStore(ds);
+    if (p.first->checkWithRules(rules))
+      p.first->netStore(ds, rules);
 }
 
-void NetElementGroup::netLoad(DataStream& ds) {
+void NetElementGroup::netLoad(DataStream& ds, NetCompatibilityRules rules) {
+  if (!checkWithRules(rules)) return;
   for (auto& p : m_elements)
-    p.first->netLoad(ds);
+    if (p.first->checkWithRules(rules))
+      p.first->netLoad(ds, rules);
 }
 
 void NetElementGroup::enableNetInterpolation(float extrapolationHint) {
@@ -56,17 +60,23 @@ void NetElementGroup::tickNetInterpolation(float dt) {
   }
 }
 
-bool NetElementGroup::writeNetDelta(DataStream& ds, uint64_t fromStep) const {
+bool NetElementGroup::writeNetDelta(DataStream& ds, uint64_t fromVersion, NetCompatibilityRules rules) const {
+  if (!checkWithRules(rules)) return false;
   if (m_elements.size() == 0) {
     return false;
   } else if (m_elements.size() == 1) {
-    return m_elements[0].first->writeNetDelta(ds, fromStep);
+    return m_elements[0].first->writeNetDelta(ds, fromVersion, rules);
   } else {
     bool deltaWritten = false;
-    for (uint64_t i = 0; i < m_elements.size(); ++i) {
-      if (m_elements[i].first->writeNetDelta(m_buffer, fromStep)) {
+    uint64_t i = 0;
+    m_buffer.setStreamCompatibilityVersion(rules);
+    for (auto& element : m_elements) {
+      if (!element.first->checkWithRules(rules))
+        continue;
+      ++i;
+      if (element.first->writeNetDelta(m_buffer, fromVersion, rules)) {
         deltaWritten = true;
-        ds.writeVlqU(i + 1);
+        ds.writeVlqU(i);
         ds.writeBytes(m_buffer.data());
         m_buffer.clear();
       }
@@ -77,23 +87,28 @@ bool NetElementGroup::writeNetDelta(DataStream& ds, uint64_t fromStep) const {
   }
 }
 
-void NetElementGroup::readNetDelta(DataStream& ds, float interpolationTime) {
+void NetElementGroup::readNetDelta(DataStream& ds, float interpolationTime, NetCompatibilityRules rules) {
+  if (!checkWithRules(rules)) return;
   if (m_elements.size() == 0) {
     throw IOException("readNetDelta called on empty NetElementGroup");
   } else if (m_elements.size() == 1) {
-    m_elements[0].first->readNetDelta(ds, interpolationTime);
+    m_elements[0].first->readNetDelta(ds, interpolationTime, rules);
   } else {
     uint64_t readIndex = ds.readVlqU();
-    for (uint64_t i = 0; i < m_elements.size(); ++i) {
+    uint64_t i = 0;
+    for (auto& element : m_elements) {
+      if (!element.first->checkWithRules(rules))
+        continue;
       if (readIndex == 0 || readIndex - 1 > i) {
         if (m_interpolationEnabled)
           m_elements[i].first->blankNetDelta(interpolationTime);
       } else if (readIndex - 1 == i) {
-        m_elements[i].first->readNetDelta(ds, interpolationTime);
+        m_elements[i].first->readNetDelta(ds, interpolationTime, rules);
         readIndex = ds.readVlqU();
       } else {
         throw IOException("group indexes out of order in NetElementGroup::readNetDelta");
       }
+      ++i;
     }
   }
 }