From 223fbe8387c41467a7a7d6ff0f262d7cc6ce6170 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Mon, 27 Jun 2022 23:11:23 +0200 Subject: [PATCH] Correctly check size of glpMsgTbl --- Source/dvlnet/base.cpp | 2 +- Source/multi.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/dvlnet/base.cpp b/Source/dvlnet/base.cpp index e24046c34..0c05c8de1 100644 --- a/Source/dvlnet/base.cpp +++ b/Source/dvlnet/base.cpp @@ -273,9 +273,9 @@ bool base::SNetReceiveTurns(char **data, size_t *size, uint32_t *status) playerState.lastTurnValue = turn.Value; turnQueue.pop_front(); - size[i] = sizeof(int32_t); status[i] |= PS_ACTIVE; status[i] |= PS_TURN_ARRIVED; + size[i] = sizeof(int32_t); data[i] = reinterpret_cast(&playerState.lastTurnValue); } diff --git a/Source/multi.cpp b/Source/multi.cpp index 28773096c..1a10aecf8 100644 --- a/Source/multi.cpp +++ b/Source/multi.cpp @@ -531,8 +531,8 @@ void multi_msg_countdown() { for (int i = 0; i < MAX_PLRS; i++) { if ((player_state[i] & PS_TURN_ARRIVED) != 0) { - if (gdwMsgLenTbl[i] == 4) - ParseTurn(i, *(DWORD *)glpMsgTbl[i]); + if (gdwMsgLenTbl[i] == sizeof(int32_t)) + ParseTurn(i, *(int32_t *)glpMsgTbl[i]); } } }