diff options
| author | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-22 17:11:34 +0100 |
|---|---|---|
| committer | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-22 17:11:34 +0100 |
| commit | 15a980a6169ff975628bf1d4ecd16168fe609bf4 (patch) | |
| tree | a7bc776991e20a21206f2198d1f702a6800bec6f /src/Chunk.cpp | |
| parent | removed lua makefile (diff) | |
| download | cuberite-15a980a6169ff975628bf1d4ecd16168fe609bf4.tar cuberite-15a980a6169ff975628bf1d4ecd16168fe609bf4.tar.gz cuberite-15a980a6169ff975628bf1d4ecd16168fe609bf4.tar.bz2 cuberite-15a980a6169ff975628bf1d4ecd16168fe609bf4.tar.lz cuberite-15a980a6169ff975628bf1d4ecd16168fe609bf4.tar.xz cuberite-15a980a6169ff975628bf1d4ecd16168fe609bf4.tar.zst cuberite-15a980a6169ff975628bf1d4ecd16168fe609bf4.zip | |
Diffstat (limited to 'src/Chunk.cpp')
| -rw-r--r-- | src/Chunk.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/Chunk.cpp b/src/Chunk.cpp index c446db9a6..b229a4aff 100644 --- a/src/Chunk.cpp +++ b/src/Chunk.cpp @@ -527,9 +527,10 @@ void cChunk::SpawnMobs(cMobSpawner& a_MobSpawner) // MG TODO : check that "Level" really means Y + /* NIBBLETYPE SkyLight = 0; - NIBBLETYPE BlockLight = 0; + */ if (IsLightValid()) { @@ -2324,8 +2325,8 @@ BLOCKTYPE cChunk::GetBlock(int a_BlockIdx) const void cChunk::GetBlockTypeMeta(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta) { int Idx = cChunkDef::MakeIndexNoCheck(a_RelX, a_RelY, a_RelZ); - a_BlockType = cChunkDef::GetBlock (m_BlockTypes, a_RelX, a_RelY, a_RelZ); - a_BlockMeta = cChunkDef::GetNibble(m_BlockMeta, a_RelX, a_RelY, a_RelZ); + a_BlockType = cChunkDef::GetBlock (m_BlockTypes, Idx); + a_BlockMeta = cChunkDef::GetNibble(m_BlockMeta, Idx); } @@ -2897,11 +2898,3 @@ NIBBLETYPE cChunk::GetTimeAlteredLight(NIBBLETYPE a_Skylight) const - -#if !C_CHUNK_USE_INLINE -# include "cChunk.inl.h" -#endif - - - - |