Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 16:41:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source 
Conflicts:
	assignment-client/src/octree/OctreeInboundPacketProcessor.cpp
This commit is contained in:
wangyix 2014-06-18 15:21:19 -07:00
commit 827b28ceda
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/octree/src/OctreeEditPacketSender.cpp
View file

@ -354,7 +354,7 @@ void OctreeEditPacketSender::processNackPacket(const QByteArray& packet) {
// read number of sequence numbers // read number of sequence numbers
uint16_t numSequenceNumbers = (*(uint16_t*)dataAt); uint16_t numSequenceNumbers = (*(uint16_t*)dataAt);
dataAt += sizeof(uint16_t); dataAt += sizeof(uint16_t);
// read sequence numbers and queue packets for resend // read sequence numbers and queue packets for resend
for (int i = 0; i < numSequenceNumbers; i++) { for (int i = 0; i < numSequenceNumbers; i++) {
unsigned short int sequenceNumber = (*(unsigned short int*)dataAt); unsigned short int sequenceNumber = (*(unsigned short int*)dataAt);