Skip to content

Commit fd40899

Browse files
committed
net: add Frame field to DisconnectFrame/DisconnectScreenOff/FrameResendRequest serialization
1 parent fbe3a63 commit fd40899

File tree

1 file changed

+24
-4
lines changed

1 file changed

+24
-4
lines changed

Core/GameEngine/Source/GameNetwork/NetPacket.cpp

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -540,10 +540,12 @@ void NetPacket::FillBufferWithAckCommand(UnsignedByte *buffer, NetCommandRef *ms
540540

541541
}
542542

543-
buffer[offset] = NetPacketFieldTypes::CommandType;
544-
++offset;
545-
buffer[offset] = type;
546-
offset += sizeof(UnsignedByte);
543+
if (type != 0) {
544+
buffer[offset] = NetPacketFieldTypes::CommandType;
545+
++offset;
546+
buffer[offset] = type;
547+
offset += sizeof(UnsignedByte);
548+
}
547549

548550
buffer[offset] = NetPacketFieldTypes::PlayerId;
549551
++offset;
@@ -1368,6 +1370,12 @@ void NetPacket::FillBufferWithDisconnectFrameMessage(UnsignedByte *buffer, NetCo
13681370
buffer[offset] = cmdMsg->getNetCommandType();
13691371
offset += sizeof(UnsignedByte);
13701372

1373+
buffer[offset] = NetPacketFieldTypes::Frame;
1374+
++offset;
1375+
UnsignedInt newframe = cmdMsg->getExecutionFrame();
1376+
memcpy(buffer + offset, &newframe, sizeof(UnsignedInt));
1377+
offset += sizeof(UnsignedInt);
1378+
13711379
// relay
13721380
buffer[offset] = NetPacketFieldTypes::Relay;
13731381
++offset;
@@ -1406,6 +1414,12 @@ void NetPacket::FillBufferWithDisconnectScreenOffMessage(UnsignedByte *buffer, N
14061414
buffer[offset] = cmdMsg->getNetCommandType();
14071415
offset += sizeof(UnsignedByte);
14081416

1417+
buffer[offset] = NetPacketFieldTypes::Frame;
1418+
++offset;
1419+
UnsignedInt newframe = cmdMsg->getExecutionFrame();
1420+
memcpy(buffer + offset, &newframe, sizeof(UnsignedInt));
1421+
offset += sizeof(UnsignedInt);
1422+
14091423
// relay
14101424
buffer[offset] = NetPacketFieldTypes::Relay;
14111425
++offset;
@@ -1444,6 +1458,12 @@ void NetPacket::FillBufferWithFrameResendRequestMessage(UnsignedByte *buffer, Ne
14441458
buffer[offset] = cmdMsg->getNetCommandType();
14451459
offset += sizeof(UnsignedByte);
14461460

1461+
buffer[offset] = NetPacketFieldTypes::Frame;
1462+
++offset;
1463+
UnsignedInt newframe = cmdMsg->getExecutionFrame();
1464+
memcpy(buffer + offset, &newframe, sizeof(UnsignedInt));
1465+
offset += sizeof(UnsignedInt);
1466+
14471467
// relay
14481468
buffer[offset] = NetPacketFieldTypes::Relay;
14491469
++offset;

0 commit comments

Comments
 (0)