Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-16 12:20:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

arg windows signedness warnings

Browse source
This commit is contained in:
ZappoMan 2014-03-15 23:17:03 -07:00
parent 6f85cfdb2f
commit 08d89a4565
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/octree/OctreeQueryNode.cpp
View file

@ -156,7 +156,7 @@ void OctreeQueryNode::resetOctreePacket(bool lastWasSurpressed) {
_octreePacketWaiting = false; _octreePacketWaiting = false;
} }
void OctreeQueryNode::writeToPacket(const unsigned char* buffer, int bytes) { void OctreeQueryNode::writeToPacket(const unsigned char* buffer, unsigned int bytes) {
// compressed packets include lead bytes which contain compressed size, this allows packing of // compressed packets include lead bytes which contain compressed size, this allows packing of
// multiple compressed portions together // multiple compressed portions together
if (_currentPacketIsCompressed) { if (_currentPacketIsCompressed) {

2
assignment-client/src/octree/OctreeQueryNode.h
View file

@ -31,7 +31,7 @@ public:
void resetOctreePacket(bool lastWasSurpressed = false); // resets octree packet to after "V" header void resetOctreePacket(bool lastWasSurpressed = false); // resets octree packet to after "V" header
void writeToPacket(const unsigned char* buffer, int bytes); // writes to end of packet void writeToPacket(const unsigned char* buffer, unsigned int bytes); // writes to end of packet
const unsigned char* getPacket() const { return _octreePacket; } const unsigned char* getPacket() const { return _octreePacket; }
unsigned int getPacketLength() const { return (MAX_PACKET_SIZE - _octreePacketAvailableBytes); } unsigned int getPacketLength() const { return (MAX_PACKET_SIZE - _octreePacketAvailableBytes); }

2
assignment-client/src/octree/OctreeSendThread.cpp
View file

@ -492,7 +492,7 @@ int OctreeSendThread::packetDistributor(const SharedNodePointer& node, OctreeQue
// if for some reason the finalized size is greater than our available size, then probably the "compressed" // if for some reason the finalized size is greater than our available size, then probably the "compressed"
// form actually inflated beyond our padding, and in this case we will send the current packet, then // form actually inflated beyond our padding, and in this case we will send the current packet, then
// write to out new packet... // write to out new packet...
int writtenSize = _packetData.getFinalizedSize() unsigned int writtenSize = _packetData.getFinalizedSize()
+ (nodeData->getCurrentPacketIsCompressed() ? sizeof(OCTREE_PACKET_INTERNAL_SECTION_SIZE) : 0); + (nodeData->getCurrentPacketIsCompressed() ? sizeof(OCTREE_PACKET_INTERNAL_SECTION_SIZE) : 0);