diff options
| author | madmaxoft <github@xoft.cz> | 2014-01-02 17:33:18 +0100 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-01-02 17:33:18 +0100 |
| commit | c510683d2a64e75a667134ef0b63e9638c474c28 (patch) | |
| tree | efbd4b1ee8205bf02bfe705b18647626745438a9 /src/WorldStorage | |
| parent | Merge pull request #484 from worktycho/cmake-fixes (diff) | |
| download | cuberite-c510683d2a64e75a667134ef0b63e9638c474c28.tar cuberite-c510683d2a64e75a667134ef0b63e9638c474c28.tar.gz cuberite-c510683d2a64e75a667134ef0b63e9638c474c28.tar.bz2 cuberite-c510683d2a64e75a667134ef0b63e9638c474c28.tar.lz cuberite-c510683d2a64e75a667134ef0b63e9638c474c28.tar.xz cuberite-c510683d2a64e75a667134ef0b63e9638c474c28.tar.zst cuberite-c510683d2a64e75a667134ef0b63e9638c474c28.zip | |
Diffstat (limited to 'src/WorldStorage')
| -rw-r--r-- | src/WorldStorage/FastNBT.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/WorldStorage/FastNBT.cpp b/src/WorldStorage/FastNBT.cpp index e55011069..64220f09a 100644 --- a/src/WorldStorage/FastNBT.cpp +++ b/src/WorldStorage/FastNBT.cpp @@ -80,7 +80,7 @@ bool cParsedNBT::ReadString(int & a_StringStart, int & a_StringLen) { NEEDBYTES(2); a_StringStart = m_Pos + 2; - a_StringLen = ntohs(*((short *)(m_Data + m_Pos))); + a_StringLen = GetBEShort(m_Data + m_Pos); if (a_StringLen < 0) { // Invalid string length @@ -135,7 +135,7 @@ bool cParsedNBT::ReadList(eTagType a_ChildrenType) // Read the count: NEEDBYTES(4); - int Count = ntohl(*((int *)(m_Data + m_Pos))); + int Count = GetBEInt(m_Data + m_Pos); m_Pos += 4; if (Count < 0) { @@ -197,7 +197,7 @@ bool cParsedNBT::ReadTag(void) case TAG_ByteArray: { NEEDBYTES(4); - int len = ntohl(*((int *)(m_Data + m_Pos))); + int len = GetBEInt(m_Data + m_Pos); m_Pos += 4; if (len < 0) { @@ -229,7 +229,7 @@ bool cParsedNBT::ReadTag(void) case TAG_IntArray: { NEEDBYTES(4); - int len = ntohl(*((int *)(m_Data + m_Pos))); + int len = GetBEInt(m_Data + m_Pos); m_Pos += 4; if (len < 0) { @@ -401,7 +401,7 @@ void cFastNBTWriter::EndList(void) ASSERT(m_Stack[m_CurrentStack].m_Type == TAG_List); // Update the list count: - *((int *)(m_Result.c_str() + m_Stack[m_CurrentStack].m_Pos)) = htonl(m_Stack[m_CurrentStack].m_Count); + SetBEInt((char *)(m_Result.c_str() + m_Stack[m_CurrentStack].m_Pos), m_Stack[m_CurrentStack].m_Count); --m_CurrentStack; } |