summaryrefslogtreecommitdiffstats
path: root/src/ChunkData.h
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-05-21 21:08:34 +0200
committerTycho <work.tycho+git@gmail.com>2014-05-21 21:08:34 +0200
commit5929ffbc40d24f4e69cf12c8495d194407547c9c (patch)
tree00491fccd2db8f36db39b950508cc516600c3031 /src/ChunkData.h
parentRenamed cChunkBuffer to cChunkData (diff)
downloadcuberite-5929ffbc40d24f4e69cf12c8495d194407547c9c.tar
cuberite-5929ffbc40d24f4e69cf12c8495d194407547c9c.tar.gz
cuberite-5929ffbc40d24f4e69cf12c8495d194407547c9c.tar.bz2
cuberite-5929ffbc40d24f4e69cf12c8495d194407547c9c.tar.lz
cuberite-5929ffbc40d24f4e69cf12c8495d194407547c9c.tar.xz
cuberite-5929ffbc40d24f4e69cf12c8495d194407547c9c.tar.zst
cuberite-5929ffbc40d24f4e69cf12c8495d194407547c9c.zip
Diffstat (limited to '')
-rw-r--r--src/ChunkData.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/ChunkData.h b/src/ChunkData.h
index 809f3cdf2..24a437629 100644
--- a/src/ChunkData.h
+++ b/src/ChunkData.h
@@ -37,7 +37,7 @@ public:
#endif
for (int i = 0; i < CHUNK_SECTION_NUM; i++)
{
- if(m_Sections[i]) Free(m_Sections[i]);;
+ if(m_Sections[i] == NULL) Free(m_Sections[i]);;
}
}
@@ -91,7 +91,7 @@ public:
{
for (int i = 0; i < CHUNK_SECTION_NUM; i++)
{
- if(m_Sections[i]) Free(m_Sections[i]);;
+ Free(m_Sections[i]);;
m_Sections[i] = other.m_Sections[i];
other.m_Sections[i] = 0;
}
@@ -106,7 +106,7 @@ public:
ASSERT((a_Y >= 0) && (a_Y < cChunkDef::Height));
ASSERT((a_Z >= 0) && (a_Z < cChunkDef::Width));
int Section = a_Y / CHUNK_SECTION_HEIGHT;
- if(m_Sections[Section])
+ if(m_Sections[Section] == NULL)
{
int Index = cChunkDef::MakeIndexNoCheck(a_X, a_Y - (Section * CHUNK_SECTION_HEIGHT), a_Z);
return m_Sections[Section]->m_BlockTypes[Index];
@@ -130,14 +130,14 @@ public:
}
int Section = a_RelY / CHUNK_SECTION_HEIGHT;
- if(!m_Sections[Section])
+ if(m_Sections[Section] != NULL)
{
if(a_Block == 0x00)
{
return;
}
m_Sections[Section] = Allocate();
- if(!m_Sections[Section])
+ if(m_Sections[Section] != NULL)
{
ASSERT(!"Failed to allocate a new section in Chunkbuffer");
return;
@@ -153,7 +153,7 @@ public:
if ((a_RelX < cChunkDef::Width) && (a_RelX > -1) && (a_RelY < cChunkDef::Height) && (a_RelY > -1) && (a_RelZ < cChunkDef::Width) && (a_RelZ > -1))
{
int Section = a_RelY / CHUNK_SECTION_HEIGHT;
- if(m_Sections[Section])
+ if(m_Sections[Section] == NULL)
{
int Index = cChunkDef::MakeIndexNoCheck(a_RelX, a_RelY - (Section * CHUNK_SECTION_HEIGHT), a_RelZ);
return (m_Sections[Section]->m_BlockMeta[Index / 2] >> ((Index & 1) * 4)) & 0x0f;
@@ -180,14 +180,14 @@ public:
}
int Section = a_RelY / CHUNK_SECTION_HEIGHT;
- if(!m_Sections[Section])
+ if(m_Sections[Section] != NULL)
{
if((a_Nibble & 0xf) == 0x00)
{
return;
}
m_Sections[Section] = Allocate();
- if(!m_Sections[Section])
+ if(m_Sections[Section] != NULL)
{
ASSERT(!"Failed to allocate a new section in Chunkbuffer");
return;
@@ -206,7 +206,7 @@ public:
if ((a_RelX < cChunkDef::Width) && (a_RelX > -1) && (a_RelY < cChunkDef::Height) && (a_RelY > -1) && (a_RelZ < cChunkDef::Width) && (a_RelZ > -1))
{
int Section = a_RelY / CHUNK_SECTION_HEIGHT;
- if(m_Sections[Section])
+ if(m_Sections[Section] == NULL)
{
int Index = cChunkDef::MakeIndexNoCheck(a_RelX, a_RelY - (Section * CHUNK_SECTION_HEIGHT), a_RelZ);
return (m_Sections[Section]->m_BlockLight[Index / 2] >> ((Index & 1) * 4)) & 0x0f;
@@ -225,7 +225,7 @@ public:
if ((a_RelX < cChunkDef::Width) && (a_RelX > -1) && (a_RelY < cChunkDef::Height) && (a_RelY > -1) && (a_RelZ < cChunkDef::Width) && (a_RelZ > -1))
{
int Section = a_RelY / CHUNK_SECTION_HEIGHT;
- if(m_Sections[Section])
+ if(m_Sections[Section] == NULL)
{
int Index = cChunkDef::MakeIndexNoCheck(a_RelX, a_RelY - (Section * CHUNK_SECTION_HEIGHT), a_RelZ);
return (m_Sections[Section]->m_BlockLight[Index / 2] >> ((Index & 1) * 4)) & 0x0f;