diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-10-20 13:40:34 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-10-20 13:40:34 +0200 |
| commit | d006ea533763c19d0c35877e87c1384bdd65630d (patch) | |
| tree | 24d45e32142ac5b9553caa47c62e4e71e45bceaf /source/Chunk.h | |
| parent | PACKET_DESTROY_ENTITY isn't sent for self when the player is kicked (FS #254) (diff) | |
| download | cuberite-d006ea533763c19d0c35877e87c1384bdd65630d.tar cuberite-d006ea533763c19d0c35877e87c1384bdd65630d.tar.gz cuberite-d006ea533763c19d0c35877e87c1384bdd65630d.tar.bz2 cuberite-d006ea533763c19d0c35877e87c1384bdd65630d.tar.lz cuberite-d006ea533763c19d0c35877e87c1384bdd65630d.tar.xz cuberite-d006ea533763c19d0c35877e87c1384bdd65630d.tar.zst cuberite-d006ea533763c19d0c35877e87c1384bdd65630d.zip | |
Diffstat (limited to 'source/Chunk.h')
| -rw-r--r-- | source/Chunk.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/Chunk.h b/source/Chunk.h index 9b0602f0b..3ecf50907 100644 --- a/source/Chunk.h +++ b/source/Chunk.h @@ -134,7 +134,8 @@ public: void FastSetBlock(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_BlockType, BLOCKTYPE a_BlockMeta ); // Doesn't force block updates on neighbors, use for simple changes such as grass growing etc. BLOCKTYPE GetBlock( int a_X, int a_Y, int a_Z ); BLOCKTYPE GetBlock( int a_BlockIdx ); - void GetBlockTypeMeta(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta); + void GetBlockTypeMeta(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta); + void GetBlockInfo (int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_Meta, NIBBLETYPE & a_SkyLight, NIBBLETYPE & a_BlockLight); /// Queues all 6 neighbors of the specified block for checking. If outside the chunk, relays the checking to the neighboring chunk void CheckNeighbors(int a_RelX, int a_RelY, int a_RelZ); @@ -228,8 +229,8 @@ public: inline NIBBLETYPE GetMeta(int a_BlockIdx) {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 NIBBLETYPE GetLight(int a_RelX, int a_RelY, int a_RelZ) {return cChunkDef::GetNibble(m_BlockLight, a_RelX, a_RelY, a_RelZ); } - inline NIBBLETYPE GetSkyLight(int a_RelX, int a_RelY, int a_RelZ) {return cChunkDef::GetNibble(m_BlockSkyLight, a_RelX, a_RelY, a_RelZ); } + inline NIBBLETYPE GetBlockLight(int a_RelX, int a_RelY, int a_RelZ) {return cChunkDef::GetNibble(m_BlockLight, a_RelX, a_RelY, a_RelZ); } + inline NIBBLETYPE GetSkyLight (int a_RelX, int a_RelY, int a_RelZ) {return cChunkDef::GetNibble(m_BlockSkyLight, a_RelX, a_RelY, a_RelZ); } private: |