From f2223d8bd7cfc3781fbdf77afaf387e31eaceab4 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Sat, 2 Apr 2022 04:11:44 +0200 Subject: [PATCH] Fix CNetChan structure for anything lower than S3 --- r5dev/engine/net_chan.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/r5dev/engine/net_chan.h b/r5dev/engine/net_chan.h index f25f226a..cfdb31d9 100644 --- a/r5dev/engine/net_chan.h +++ b/r5dev/engine/net_chan.h @@ -110,6 +110,9 @@ private: int m_nOutSequenceNrAck; int m_nChokedPackets; int unknown_challenge_var; +#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1) || defined (GAMEDLL_S2) + char pad[8]; +#endif int m_nLastRecvFlags; RTL_SRWLOCK LOCK; bf_write m_StreamReliable; @@ -161,7 +164,10 @@ private: uint8_t m_bRetrySendLong; v_netadr_t remote_address; }; - +#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1) || defined (GAMEDLL_S2) +static_assert(sizeof(CNetChan) == 0x1AD0); +#else static_assert(sizeof(CNetChan) == 0x1AC8); +#endif #endif // NET_CHAN_H