Skip to content

Commit 88a1de0

Browse files
committed
net: fix getPackedByteCount for DisconnectFrame/DisconnectScreenOff/FrameResendRequest to include Frame field
1 parent fd40899 commit 88a1de0

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Core/GameEngine/Source/GameNetwork/NetCommandMsg.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ Int NetAckBothCommandMsg::getSortNumber() {
356356
}
357357

358358
size_t NetAckBothCommandMsg::getPackedByteCount() const {
359-
return sizeof(NetPacketAckCommand);
359+
return sizeof(NetPacketPlayerIdField) + sizeof(NetPacketDataFieldHeader) + sizeof(UnsignedShort) + sizeof(UnsignedByte);
360360
}
361361

362362
//-------------------------
@@ -968,7 +968,7 @@ void NetProgressCommandMsg::setPercentage( UnsignedByte percent )
968968
}
969969

970970
size_t NetProgressCommandMsg::getPackedByteCount() const {
971-
return sizeof(NetPacketProgressMessage);
971+
return sizeof(NetPacketProgressMessage) - sizeof(NetPacketCommandIdField);
972972
}
973973

974974
//-------------------------
@@ -1047,7 +1047,7 @@ void NetWrapperCommandMsg::setWrappedCommandID(UnsignedShort wrappedCommandID) {
10471047
}
10481048

10491049
size_t NetWrapperCommandMsg::getPackedByteCount() const {
1050-
return sizeof(NetPacketWrapperCommand);
1050+
return sizeof(NetPacketWrapperCommand) + m_dataLength;
10511051
}
10521052

10531053
//-------------------------
@@ -1197,7 +1197,7 @@ void NetDisconnectFrameCommandMsg::setDisconnectFrame(UnsignedInt disconnectFram
11971197
}
11981198

11991199
size_t NetDisconnectFrameCommandMsg::getPackedByteCount() const {
1200-
return sizeof(NetPacketDisconnectFrameCommand);
1200+
return sizeof(NetPacketDisconnectFrameCommand) + sizeof(UnsignedByte) + sizeof(UnsignedInt);
12011201
}
12021202

12031203
//-------------------------
@@ -1220,7 +1220,7 @@ void NetDisconnectScreenOffCommandMsg::setNewFrame(UnsignedInt newFrame) {
12201220
}
12211221

12221222
size_t NetDisconnectScreenOffCommandMsg::getPackedByteCount() const {
1223-
return sizeof(NetPacketDisconnectScreenOffCommand);
1223+
return sizeof(NetPacketDisconnectScreenOffCommand) + sizeof(UnsignedByte) + sizeof(UnsignedInt);
12241224
}
12251225

12261226
//-------------------------
@@ -1243,7 +1243,7 @@ void NetFrameResendRequestCommandMsg::setFrameToResend(UnsignedInt frame) {
12431243
}
12441244

12451245
size_t NetFrameResendRequestCommandMsg::getPackedByteCount() const {
1246-
return sizeof(NetPacketFrameResendRequestCommand);
1246+
return sizeof(NetPacketFrameResendRequestCommand) + sizeof(UnsignedByte) + sizeof(UnsignedInt);
12471247
}
12481248

12491249
//-------------------------

0 commit comments

Comments
 (0)