Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 02:25:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.x and some warning fixes

Browse Source
This commit is contained in:
Spp
2011-12-27 10:05:49 +01:00
parent 8323027e0c 3176289024
commit fa9daaf95b
148 changed files with 2881 additions and 969 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/shared/Packets/ByteBuffer.cpp
View File

@@ -73,7 +73,7 @@ void BitStream::Print()
for (uint32 i = 0; i < GetLength(); ++i)
ss << uint32(GetBit(i)) << " ";
sLog->outDebug(LOG_FILTER_NETWORKIO, ss.str().c_str());
sLog->outDebug(LOG_FILTER_NETWORKIO, "%s", ss.str().c_str());
}
ByteBuffer::ByteBuffer(size_t res, bool init): _rpos(0), _wpos(0), _bitpos(8), _curbitval(0)

4
src/server/shared/Packets/ByteBuffer.h
View File

@@ -57,7 +57,7 @@ class BitStream
WriteBits(val, len);
}
BitStream(BitStream const& bs) : _rpos(bs._rpos), _wpos(bs._wpos), _data(bs._data) {}
BitStream(BitStream const& bs) : _data(bs._data), _rpos(bs._rpos), _wpos(bs._wpos) {}
void Clear();
uint8 GetBit(uint32 bit);
@@ -104,7 +104,7 @@ class ByteBuffer
// copy constructor
ByteBuffer(const ByteBuffer &buf) : _rpos(buf._rpos), _wpos(buf._wpos),
_storage(buf._storage), _bitpos(buf._bitpos), _curbitval(buf._curbitval)
_bitpos(buf._bitpos), _curbitval(buf._curbitval), _storage(buf._storage)
{
}