Skip to content

Commit 1986d80

Browse files
committed
Undo order change.
1 parent f281330 commit 1986d80

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketSender.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ PA_NO_INLINE void PacketSender::send_oob_packet_empty(uint8_t seqnum, uint8_t op
6262
uint8_t crc32[sizeof(uint32_t)];
6363
} packet;
6464
packet.header.magic_number = PABB2_CONNECTION_MAGIC_NUMBER;
65-
packet.header.opcode = opcode;
6665
packet.header.seqnum = seqnum;
6766
packet.header.packet_bytes = sizeof(packet);
67+
packet.header.opcode = opcode;
6868
pabb_crc32_write_to_message(m_session_id, &packet, sizeof(packet));
6969
m_connection.unreliable_send(&packet, sizeof(packet));
7070
}
@@ -74,9 +74,9 @@ PA_NO_INLINE void PacketSender::send_oob_packet_u8(uint8_t seqnum, uint8_t opcod
7474
uint8_t crc32[sizeof(uint32_t)];
7575
} packet;
7676
packet.header.magic_number = PABB2_CONNECTION_MAGIC_NUMBER;
77-
packet.header.opcode = opcode;
7877
packet.header.seqnum = seqnum;
7978
packet.header.packet_bytes = sizeof(packet);
79+
packet.header.opcode = opcode;
8080
packet.header.data = data;
8181
pabb_crc32_write_to_message(m_session_id, &packet, sizeof(packet));
8282
m_connection.unreliable_send(&packet, sizeof(packet));
@@ -87,9 +87,9 @@ PA_NO_INLINE void PacketSender::send_oob_packet_u16(uint8_t seqnum, uint8_t opco
8787
uint8_t crc32[sizeof(uint32_t)];
8888
} packet;
8989
packet.header.magic_number = PABB2_CONNECTION_MAGIC_NUMBER;
90-
packet.header.opcode = opcode;
9190
packet.header.seqnum = seqnum;
9291
packet.header.packet_bytes = sizeof(packet);
92+
packet.header.opcode = opcode;
9393
memcpy(&packet.header.data, &data, sizeof(uint16_t));
9494
pabb_crc32_write_to_message(m_session_id, &packet, sizeof(packet));
9595
m_connection.unreliable_send(&packet, sizeof(packet));
@@ -100,9 +100,9 @@ PA_NO_INLINE void PacketSender::send_oob_packet_u32(uint8_t seqnum, uint8_t opco
100100
uint8_t crc32[sizeof(uint32_t)];
101101
} packet;
102102
packet.header.magic_number = PABB2_CONNECTION_MAGIC_NUMBER;
103-
packet.header.opcode = opcode;
104103
packet.header.seqnum = seqnum;
105104
packet.header.packet_bytes = sizeof(packet);
105+
packet.header.opcode = opcode;
106106
memcpy(&packet.header.data, &data, sizeof(uint32_t));
107107
pabb_crc32_write_to_message(m_session_id, &packet, sizeof(packet));
108108
m_connection.unreliable_send(&packet, sizeof(packet));
@@ -113,9 +113,9 @@ PA_NO_INLINE void PacketSender::send_oob_packet_data(
113113
){
114114
PacketHeader header;
115115
header.magic_number = PABB2_CONNECTION_MAGIC_NUMBER;
116-
header.opcode = opcode;
117116
header.seqnum = seqnum;
118117
header.packet_bytes = sizeof(PacketHeader) + sizeof(uint32_t) + bytes;
118+
header.opcode = opcode;
119119
uint32_t crc = m_session_id;
120120
pabb_crc32_buffer(&crc, &header, sizeof(PacketHeader));
121121
pabb_crc32_buffer(&crc, data, bytes);
@@ -130,9 +130,9 @@ PA_NO_INLINE void PacketSender::send_oob_packet_u32_data(
130130
){
131131
PacketHeader_u32 header;
132132
header.magic_number = PABB2_CONNECTION_MAGIC_NUMBER;
133-
header.opcode = opcode;
134133
header.seqnum = seqnum;
135134
header.packet_bytes = sizeof(PacketHeader_u32) + sizeof(uint32_t) + bytes;
135+
header.opcode = opcode;
136136
memcpy(&header.data, &u32, sizeof(uint32_t));
137137
uint32_t crc = m_session_id;
138138
pabb_crc32_buffer(&crc, &header, sizeof(PacketHeader_u32));

0 commit comments

Comments
 (0)