summaryrefslogtreecommitdiffstats
path: root/src/Chunk.cpp
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-12-30 17:41:59 +0100
committermadmaxoft <github@xoft.cz>2013-12-30 17:41:59 +0100
commitee15d4e08e90536afbb381a6d65a418e0027658d (patch)
tree6ac904913525ac4339d05693f4da6aa12cc8ef9e /src/Chunk.cpp
parentconverted commneted paramater names to the unused macro (diff)
downloadcuberite-ee15d4e08e90536afbb381a6d65a418e0027658d.tar
cuberite-ee15d4e08e90536afbb381a6d65a418e0027658d.tar.gz
cuberite-ee15d4e08e90536afbb381a6d65a418e0027658d.tar.bz2
cuberite-ee15d4e08e90536afbb381a6d65a418e0027658d.tar.lz
cuberite-ee15d4e08e90536afbb381a6d65a418e0027658d.tar.xz
cuberite-ee15d4e08e90536afbb381a6d65a418e0027658d.tar.zst
cuberite-ee15d4e08e90536afbb381a6d65a418e0027658d.zip
Diffstat (limited to 'src/Chunk.cpp')
-rw-r--r--src/Chunk.cpp20
1 files changed, 7 insertions, 13 deletions
diff --git a/src/Chunk.cpp b/src/Chunk.cpp
index a16d34f3b..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;*/
+ /*
+ NIBBLETYPE SkyLight = 0;
+ NIBBLETYPE BlockLight = 0;
+ */
if (IsLightValid())
{
@@ -2323,8 +2324,9 @@ 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)
{
- a_BlockType = cChunkDef::GetBlock (m_BlockTypes, a_RelX, a_RelY, a_RelZ);
- a_BlockMeta = cChunkDef::GetNibble(m_BlockMeta, a_RelX, a_RelY, a_RelZ);
+ int Idx = cChunkDef::MakeIndexNoCheck(a_RelX, a_RelY, a_RelZ);
+ a_BlockType = cChunkDef::GetBlock (m_BlockTypes, Idx);
+ a_BlockMeta = cChunkDef::GetNibble(m_BlockMeta, Idx);
}
@@ -2896,11 +2898,3 @@ NIBBLETYPE cChunk::GetTimeAlteredLight(NIBBLETYPE a_Skylight) const
-
-#if !C_CHUNK_USE_INLINE
-# include "cChunk.inl.h"
-#endif
-
-
-
-