summaryrefslogtreecommitdiffstats
path: root/src/Chunk.h
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-05-06 21:15:19 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-05-06 21:15:19 +0200
commit696a7bc52e9b029b627feee76eaf5e1239417033 (patch)
treeac3e5152dd6e7eb2a9420daad8df3bb2560d544f /src/Chunk.h
parentSuggestions'd #2 (diff)
parentMerge pull request #978 from mc-server/VectorAssignmentOperator (diff)
downloadcuberite-696a7bc52e9b029b627feee76eaf5e1239417033.tar
cuberite-696a7bc52e9b029b627feee76eaf5e1239417033.tar.gz
cuberite-696a7bc52e9b029b627feee76eaf5e1239417033.tar.bz2
cuberite-696a7bc52e9b029b627feee76eaf5e1239417033.tar.lz
cuberite-696a7bc52e9b029b627feee76eaf5e1239417033.tar.xz
cuberite-696a7bc52e9b029b627feee76eaf5e1239417033.tar.zst
cuberite-696a7bc52e9b029b627feee76eaf5e1239417033.zip
Diffstat (limited to 'src/Chunk.h')
-rw-r--r--src/Chunk.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/Chunk.h b/src/Chunk.h
index a15d43e00..84ec35496 100644
--- a/src/Chunk.h
+++ b/src/Chunk.h
@@ -320,10 +320,10 @@ public:
m_BlockTickZ = a_RelZ;
}
- inline NIBBLETYPE GetMeta(int a_RelX, int a_RelY, int a_RelZ) const {return cChunkDef::GetNibble(m_BlockMeta, a_RelX, a_RelY, a_RelZ); }
- inline NIBBLETYPE GetMeta(int a_BlockIdx) const {return cChunkDef::GetNibble(m_BlockMeta, a_BlockIdx); }
- inline void SetMeta(int a_RelX, int a_RelY, int a_RelZ, NIBBLETYPE a_Meta) { cChunkDef::SetNibble(m_BlockMeta, a_RelX, a_RelY, a_RelZ, a_Meta); }
- inline void SetMeta(int a_BlockIdx, NIBBLETYPE a_Meta) { cChunkDef::SetNibble(m_BlockMeta, a_BlockIdx, a_Meta); }
+ inline NIBBLETYPE GetMeta(int a_RelX, int a_RelY, int a_RelZ) const { return cChunkDef::GetNibble(m_BlockMeta, a_RelX, a_RelY, a_RelZ); }
+ inline NIBBLETYPE GetMeta(int a_BlockIdx) const { return cChunkDef::GetNibble(m_BlockMeta, a_BlockIdx); }
+ inline void SetMeta(int a_RelX, int a_RelY, int a_RelZ, NIBBLETYPE a_Meta) { SetMeta(MakeIndex(a_RelX, a_RelY, a_RelZ), a_Meta); }
+ void SetMeta(int a_BlockIdx, NIBBLETYPE a_Meta);
inline NIBBLETYPE GetBlockLight(int a_RelX, int a_RelY, int a_RelZ) const {return cChunkDef::GetNibble(m_BlockLight, a_RelX, a_RelY, a_RelZ); }
inline NIBBLETYPE GetSkyLight (int a_RelX, int a_RelY, int a_RelZ) const {return cChunkDef::GetNibble(m_BlockSkyLight, a_RelX, a_RelY, a_RelZ, true); }
@@ -420,7 +420,6 @@ private:
cWorld * m_World;
cChunkMap * m_ChunkMap;
- // TODO: Make these pointers and don't allocate what isn't needed
COMPRESSED_BLOCKTYPE m_BlockTypes;
COMPRESSED_NIBBLETYPE m_BlockMeta;
COMPRESSED_NIBBLETYPE m_BlockLight;