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

Changed cChunkData::SetMeta to return a bool indicating whether the value changed

Browse Source
This commit is contained in:
Tycho 2014-05-21 20:18:09 +01:00
parent 5929ffbc40
commit bd880603a5
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Chunk.h
View File

@ -328,10 +328,10 @@ public:
} }
inline void SetMeta(int a_RelX, int a_RelY, int a_RelZ, NIBBLETYPE a_Meta) inline void SetMeta(int a_RelX, int a_RelY, int a_RelZ, NIBBLETYPE a_Meta)
{ {
if (!(GetMeta(a_RelX, a_RelY, a_RelZ) == a_Meta)) bool hasChanged = m_ChunkData.SetMeta(a_RelX, a_RelY, a_RelZ, a_Meta);
if (hasChanged)
{ {
MarkDirty(); MarkDirty();
m_ChunkData.SetMeta(a_RelX, a_RelY, a_RelZ, a_Meta);
m_PendingSendBlocks.push_back(sSetBlock(m_PosX, m_PosZ, a_RelX, a_RelY, a_RelZ, GetBlock(a_RelX, a_RelY, a_RelZ), a_Meta)); m_PendingSendBlocks.push_back(sSetBlock(m_PosX, m_PosZ, a_RelX, a_RelY, a_RelZ, GetBlock(a_RelX, a_RelY, a_RelZ), a_Meta));
} }

10
src/ChunkData.h
View File

@ -167,7 +167,7 @@ public:
return 0; return 0;
} }
void SetMeta(int a_RelX, int a_RelY, int a_RelZ, NIBBLETYPE a_Nibble) bool SetMeta(int a_RelX, int a_RelY, int a_RelZ, NIBBLETYPE a_Nibble)
{ {
if ( if (
(a_RelX >= cChunkDef::Width) || (a_RelX < 0) || (a_RelX >= cChunkDef::Width) || (a_RelX < 0) ||
@ -176,7 +176,7 @@ public:
) )
{ {
ASSERT(!"cChunkData::SetMeta(): index out of range!"); ASSERT(!"cChunkData::SetMeta(): index out of range!");
return; return false;
} }
int Section = a_RelY / CHUNK_SECTION_HEIGHT; int Section = a_RelY / CHUNK_SECTION_HEIGHT;
@ -184,21 +184,23 @@ public:
{ {
if((a_Nibble & 0xf) == 0x00) if((a_Nibble & 0xf) == 0x00)
{ {
return; return false;
} }
m_Sections[Section] = Allocate(); m_Sections[Section] = Allocate();
if(m_Sections[Section] != NULL) if(m_Sections[Section] != NULL)
{ {
ASSERT(!"Failed to allocate a new section in Chunkbuffer"); ASSERT(!"Failed to allocate a new section in Chunkbuffer");
return; return false;
} }
ZeroSection(m_Sections[Section]); ZeroSection(m_Sections[Section]);
} }
int Index = cChunkDef::MakeIndexNoCheck(a_RelX, a_RelY - (Section * CHUNK_SECTION_HEIGHT), a_RelZ); int Index = cChunkDef::MakeIndexNoCheck(a_RelX, a_RelY - (Section * CHUNK_SECTION_HEIGHT), a_RelZ);
NIBBLETYPE oldval = m_Sections[Section]->m_BlockMeta[Index / 2] >> ((Index & 1) * 4) & 0xf;
m_Sections[Section]->m_BlockMeta[Index / 2] = static_cast<NIBBLETYPE>( m_Sections[Section]->m_BlockMeta[Index / 2] = static_cast<NIBBLETYPE>(
(m_Sections[Section]->m_BlockMeta[Index / 2] & (0xf0 >> ((Index & 1) * 4))) | // The untouched nibble (m_Sections[Section]->m_BlockMeta[Index / 2] & (0xf0 >> ((Index & 1) * 4))) | // The untouched nibble
((a_Nibble & 0x0f) << ((Index & 1) * 4)) // The nibble being set ((a_Nibble & 0x0f) << ((Index & 1) * 4)) // The nibble being set
); );
return oldval == a_Nibble;
} }
NIBBLETYPE GetBlockLight(int a_RelX, int a_RelY, int a_RelZ) const NIBBLETYPE GetBlockLight(int a_RelX, int a_RelY, int a_RelZ) const