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/StarServerClientContext.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'source/game/StarServerClientContext.cpp') diff --git a/source/game/StarServerClientContext.cpp b/source/game/StarServerClientContext.cpp index 838dae0..fcbffbd 100644 --- a/source/game/StarServerClientContext.cpp +++ b/source/game/StarServerClientContext.cpp @@ -10,10 +10,11 @@ namespace Star { -ServerClientContext::ServerClientContext(ConnectionId clientId, Maybe remoteAddress, Uuid playerUuid, +ServerClientContext::ServerClientContext(ConnectionId clientId, Maybe remoteAddress, NetCompatibilityRules netRules, Uuid playerUuid, String playerName, String playerSpecies, bool canBecomeAdmin, WorldChunks initialShipChunks) : m_clientId(clientId), m_remoteAddress(remoteAddress), + m_netRules(netRules), m_playerUuid(playerUuid), m_playerName(playerName), m_playerSpecies(playerSpecies), @@ -88,6 +89,10 @@ bool ServerClientContext::canBecomeAdmin() const { return m_canBecomeAdmin; } +NetCompatibilityRules ServerClientContext::netRules() const { + return m_netRules; +} + String ServerClientContext::descriptiveName() const { RecursiveMutexLocker locker(m_mutex); String hostName = m_remoteAddress ? toString(*m_remoteAddress) : "local"; @@ -184,7 +189,7 @@ ByteArray ServerClientContext::writeUpdate() { shipChunksUpdate = DataStreamBuffer::serialize(take(m_shipChunksUpdate)); ByteArray netGroupUpdate; - tie(netGroupUpdate, m_netVersion) = m_netGroup.writeNetState(m_netVersion); + tie(netGroupUpdate, m_netVersion) = m_netGroup.writeNetState(m_netVersion, m_netRules); if (rpcUpdate.empty() && shipChunksUpdate.empty() && netGroupUpdate.empty()) return {}; -- cgit v1.2.3