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

removed unneded addressof

Browse Source
This commit is contained in:
Tycho 2014-05-30 14:43:33 +01:00
parent e136f6e0f5
commit d854d3af1c
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ChunkData.cpp
View File

@ -55,6 +55,7 @@ cChunkData::~cChunkData()
for (size_t i = 0; i < NumSections; i++) for (size_t i = 0; i < NumSections; i++)
{ {
Free(m_Sections[i]); Free(m_Sections[i]);
m_Sections[i] = NULL;
} }
} }
@ -93,6 +94,7 @@ cChunkData::~cChunkData()
for (size_t i = 0; i < NumSections; i++) for (size_t i = 0; i < NumSections; i++)
{ {
Free(m_Sections[i]); Free(m_Sections[i]);
m_Sections[i] = NULL;
} }
} }
@ -101,6 +103,7 @@ cChunkData::~cChunkData()
for (size_t i = 0; i < NumSections; i++) for (size_t i = 0; i < NumSections; i++)
{ {
m_Sections[i] = a_Other.m_Sections[i]; m_Sections[i] = a_Other.m_Sections[i];
a_Other.m_Sections[i] = NULL;
} }
a_Other.m_IsOwner = false; a_Other.m_IsOwner = false;
return *this; return *this;
@ -333,27 +336,28 @@ cChunkData cChunkData::Copy(void) const
void cChunkData::CopyBlockTypes(BLOCKTYPE * a_Dest, size_t a_Idx, size_t a_Length) const void cChunkData::CopyBlockTypes(BLOCKTYPE * a_Dest, size_t a_Idx, size_t a_Length) const
{ {
int ToSkip = a_Idx; size_t ToSkip = a_Idx;
for (size_t i = 0; i < NumSections; i++) for (size_t i = 0; i < NumSections; i++)
{ {
size_t StartPos = 0; size_t StartPos = 0;
if (ToSkip > 0) if (ToSkip > 0)
{ {
ToSkip = std::max(ToSkip - (int)SectionBlockCount, 0); StartPos = std::min(ToSkip, +SectionBlockCount);
StartPos = SectionBlockCount - ToSkip; ToSkip -= StartPos;
} }
if (ToSkip < (int)SectionBlockCount) if (StartPos < SectionBlockCount)
{ {
size_t ToCopy = std::min(+SectionBlockCount, a_Length); size_t ToCopy = std::min(+SectionBlockCount - StartPos, a_Length);
a_Length -= ToCopy; a_Length -= ToCopy;
if (m_Sections[i] != NULL) if (m_Sections[i] != NULL)
{ {
memcpy(&a_Dest[(i * SectionBlockCount) - a_Idx], (&m_Sections[i]->m_BlockTypes) + StartPos, sizeof(BLOCKTYPE) * (ToCopy - StartPos)); BLOCKTYPE * blockbuffer = m_Sections[i]->m_BlockTypes;
memcpy(&a_Dest[(i * SectionBlockCount) + StartPos - a_Idx], blockbuffer + StartPos, sizeof(BLOCKTYPE) * ToCopy);
} }
else else
{ {
memset(&a_Dest[(i * SectionBlockCount) - a_Idx], 0, sizeof(BLOCKTYPE) * (ToCopy - StartPos)); memset(&a_Dest[(i * SectionBlockCount) - a_Idx], 0, sizeof(BLOCKTYPE) * ToCopy);
} }
} }
} }