flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

More size_t fixes.

Browse Source
This commit is contained in:
Mattes D 2014-05-09 19:57:59 +02:00
parent 5b54dc3eac
commit d67ea97a26
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/WorldStorage/WSSAnvil.cpp
View File

@ -405,7 +405,7 @@ bool cWSSAnvil::LoadChunkFromNBT(const cChunkCoords & a_Chunk, const cParsedNBT
void cWSSAnvil::CopyNBTData(const cParsedNBT & a_NBT, int a_Tag, const AString & a_ChildName, char * a_Destination, int a_Length) void cWSSAnvil::CopyNBTData(const cParsedNBT & a_NBT, int a_Tag, const AString & a_ChildName, char * a_Destination, size_t a_Length)
{ {
int Child = a_NBT.FindChildByName(a_Tag, a_ChildName); int Child = a_NBT.FindChildByName(a_Tag, a_ChildName);
if ((Child >= 0) && (a_NBT.GetType(Child) == TAG_ByteArray) && (a_NBT.GetDataLength(Child) == a_Length)) if ((Child >= 0) && (a_NBT.GetType(Child) == TAG_ByteArray) && (a_NBT.GetDataLength(Child) == a_Length))
@ -440,8 +440,8 @@ bool cWSSAnvil::SaveChunkToNBT(const cChunkCoords & a_Chunk, cFastNBTWriter & a_
// Save blockdata: // Save blockdata:
a_Writer.BeginList("Sections", TAG_Compound); a_Writer.BeginList("Sections", TAG_Compound);
int SliceSizeBlock = cChunkDef::Width * cChunkDef::Width * 16; size_t SliceSizeBlock = cChunkDef::Width * cChunkDef::Width * 16;
int SliceSizeNibble = SliceSizeBlock / 2; size_t SliceSizeNibble = SliceSizeBlock / 2;
const char * BlockTypes = (const char *)(Serializer.m_BlockTypes); const char * BlockTypes = (const char *)(Serializer.m_BlockTypes);
const char * BlockMetas = (const char *)(Serializer.m_BlockMetas); const char * BlockMetas = (const char *)(Serializer.m_BlockMetas);
#ifdef DEBUG_SKYLIGHT #ifdef DEBUG_SKYLIGHT
@ -2630,14 +2630,14 @@ bool cWSSAnvil::cMCAFile::GetChunkData(const cChunkCoords & a_Chunk, AString & a
unsigned ChunkLocation = ntohl(m_Header[LocalX + 32 * LocalZ]); unsigned ChunkLocation = ntohl(m_Header[LocalX + 32 * LocalZ]);
unsigned ChunkOffset = ChunkLocation >> 8; unsigned ChunkOffset = ChunkLocation >> 8;
m_File.Seek(ChunkOffset * 4096); m_File.Seek((int)ChunkOffset * 4096);
int ChunkSize = 0; int ChunkSize = 0;
if (m_File.Read(&ChunkSize, 4) != 4) if (m_File.Read(&ChunkSize, 4) != 4)
{ {
return false; return false;
} }
ChunkSize = ntohl(ChunkSize); ChunkSize = ntohl((u_long)ChunkSize);
char CompressionType = 0; char CompressionType = 0;
if (m_File.Read(&CompressionType, 1) != 1) if (m_File.Read(&CompressionType, 1) != 1)
{ {

2
src/WorldStorage/WSSAnvil.h
View File

@ -221,7 +221,7 @@ protected:
cMCAFile * LoadMCAFile(const cChunkCoords & a_Chunk); cMCAFile * LoadMCAFile(const cChunkCoords & a_Chunk);
/// Copies a_Length bytes of data from the specified NBT Tag's Child into the a_Destination buffer /// Copies a_Length bytes of data from the specified NBT Tag's Child into the a_Destination buffer
void CopyNBTData(const cParsedNBT & a_NBT, int a_Tag, const AString & a_ChildName, char * a_Destination, int a_Length); void CopyNBTData(const cParsedNBT & a_NBT, int a_Tag, const AString & a_ChildName, char * a_Destination, size_t a_Length);
// cWSSchema overrides: // cWSSchema overrides:
virtual bool LoadChunk(const cChunkCoords & a_Chunk) override; virtual bool LoadChunk(const cChunkCoords & a_Chunk) override;