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/StarNpcDatabase.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'source/game/StarNpcDatabase.cpp')

diff --git a/source/game/StarNpcDatabase.cpp b/source/game/StarNpcDatabase.cpp
index bd70df5..392b29d 100644
--- a/source/game/StarNpcDatabase.cpp
+++ b/source/game/StarNpcDatabase.cpp
@@ -157,8 +157,9 @@ NpcVariant NpcDatabase::generateNpcVariant(
   return variant;
 }
 
-ByteArray NpcDatabase::writeNpcVariant(NpcVariant const& variant) const {
+ByteArray NpcDatabase::writeNpcVariant(NpcVariant const& variant, NetCompatibilityRules rules) const {
   DataStreamBuffer ds;
+  ds.setStreamCompatibilityVersion(rules);
 
   ds.write(variant.species);
   ds.write(variant.typeName);
@@ -179,8 +180,9 @@ ByteArray NpcDatabase::writeNpcVariant(NpcVariant const& variant) const {
   return ds.data();
 }
 
-NpcVariant NpcDatabase::readNpcVariant(ByteArray const& data) const {
+NpcVariant NpcDatabase::readNpcVariant(ByteArray const& data, NetCompatibilityRules rules) const {
   DataStreamBuffer ds(data);
+  ds.setStreamCompatibilityVersion(rules);
 
   NpcVariant variant;
 
@@ -325,8 +327,8 @@ NpcPtr NpcDatabase::diskLoadNpc(Json const& diskStore) const {
   return make_shared<Npc>(npcVariant, diskStore);
 }
 
-NpcPtr NpcDatabase::netLoadNpc(ByteArray const& netStore) const {
-  return make_shared<Npc>(readNpcVariant(netStore));
+NpcPtr NpcDatabase::netLoadNpc(ByteArray const& netStore, NetCompatibilityRules rules) const {
+  return make_shared<Npc>(readNpcVariant(netStore, rules));
 }
 
 List<Drawable> NpcDatabase::npcPortrait(NpcVariant const& npcVariant, PortraitMode mode) const {
-- 
cgit v1.2.3