Browse Source

Correctly check size of glpMsgTbl

pull/4823/head
Anders Jenbo 4 years ago
parent
commit
223fbe8387
  1. 2
      Source/dvlnet/base.cpp
  2. 4
      Source/multi.cpp

2
Source/dvlnet/base.cpp

@ -273,9 +273,9 @@ bool base::SNetReceiveTurns(char **data, size_t *size, uint32_t *status)
playerState.lastTurnValue = turn.Value; playerState.lastTurnValue = turn.Value;
turnQueue.pop_front(); turnQueue.pop_front();
size[i] = sizeof(int32_t);
status[i] |= PS_ACTIVE; status[i] |= PS_ACTIVE;
status[i] |= PS_TURN_ARRIVED; status[i] |= PS_TURN_ARRIVED;
size[i] = sizeof(int32_t);
data[i] = reinterpret_cast<char *>(&playerState.lastTurnValue); data[i] = reinterpret_cast<char *>(&playerState.lastTurnValue);
} }

4
Source/multi.cpp

@ -531,8 +531,8 @@ void multi_msg_countdown()
{ {
for (int i = 0; i < MAX_PLRS; i++) { for (int i = 0; i < MAX_PLRS; i++) {
if ((player_state[i] & PS_TURN_ARRIVED) != 0) { if ((player_state[i] & PS_TURN_ARRIVED) != 0) {
if (gdwMsgLenTbl[i] == 4) if (gdwMsgLenTbl[i] == sizeof(int32_t))
ParseTurn(i, *(DWORD *)glpMsgTbl[i]); ParseTurn(i, *(int32_t *)glpMsgTbl[i]);
} }
} }
} }

Loading…
Cancel
Save