diff options
| author | Mattes D <github@xoft.cz> | 2015-01-22 14:33:36 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2015-01-22 14:33:36 +0100 |
| commit | f36a00c6037fb4ab2a5d78dbebefa067685f9f63 (patch) | |
| tree | f0ea4baa88699ac537a0f671b503d4993376927d /src/ByteBuffer.cpp | |
| parent | Fixed type conversion warnings. (diff) | |
| parent | Fixed warnings in StringUtils. (diff) | |
| download | cuberite-f36a00c6037fb4ab2a5d78dbebefa067685f9f63.tar cuberite-f36a00c6037fb4ab2a5d78dbebefa067685f9f63.tar.gz cuberite-f36a00c6037fb4ab2a5d78dbebefa067685f9f63.tar.bz2 cuberite-f36a00c6037fb4ab2a5d78dbebefa067685f9f63.tar.lz cuberite-f36a00c6037fb4ab2a5d78dbebefa067685f9f63.tar.xz cuberite-f36a00c6037fb4ab2a5d78dbebefa067685f9f63.tar.zst cuberite-f36a00c6037fb4ab2a5d78dbebefa067685f9f63.zip | |
Diffstat (limited to 'src/ByteBuffer.cpp')
| -rw-r--r-- | src/ByteBuffer.cpp | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/src/ByteBuffer.cpp b/src/ByteBuffer.cpp index e1e5867a9..f3dc44d91 100644 --- a/src/ByteBuffer.cpp +++ b/src/ByteBuffer.cpp @@ -348,8 +348,24 @@ bool cByteBuffer::ReadBEShort(short & a_Value) CHECK_THREAD CheckValid(); NEEDBYTES(2); + Int16 val; + ReadBuf(&val, 2); + val = ntohs(val); + a_Value = *(reinterpret_cast<short *>(&val)); + return true; +} + + + + + +bool cByteBuffer::ReadBEUInt16(UInt16 & a_Value) +{ + CHECK_THREAD + CheckValid(); + NEEDBYTES(2); ReadBuf(&a_Value, 2); - a_Value = (short)ntohs((u_short)a_Value); + a_Value = ntohs(a_Value); return true; } @@ -371,6 +387,20 @@ bool cByteBuffer::ReadBEInt(int & a_Value) +bool cByteBuffer::ReadBEUInt32(UInt32 & a_Value) +{ + CHECK_THREAD + CheckValid(); + NEEDBYTES(4); + ReadBuf(&a_Value, 4); + a_Value = ntohl(a_Value); + return true; +} + + + + + bool cByteBuffer::ReadBEInt64(Int64 & a_Value) { CHECK_THREAD |