diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-04-27 18:35:41 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-04-27 18:35:41 +0200 |
| commit | bbc5faa723b7dd63250949f7b28601ffd748e2f5 (patch) | |
| tree | e74901e581237b889cd8d7ccfaaf376f8b616508 /src/Chunk.h | |
| parent | Merge pull request #941 from archshift/master (diff) | |
| download | cuberite-bbc5faa723b7dd63250949f7b28601ffd748e2f5.tar cuberite-bbc5faa723b7dd63250949f7b28601ffd748e2f5.tar.gz cuberite-bbc5faa723b7dd63250949f7b28601ffd748e2f5.tar.bz2 cuberite-bbc5faa723b7dd63250949f7b28601ffd748e2f5.tar.lz cuberite-bbc5faa723b7dd63250949f7b28601ffd748e2f5.tar.xz cuberite-bbc5faa723b7dd63250949f7b28601ffd748e2f5.tar.zst cuberite-bbc5faa723b7dd63250949f7b28601ffd748e2f5.zip | |
Diffstat (limited to 'src/Chunk.h')
| -rw-r--r-- | src/Chunk.h | 9 |
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; |