From 445d31acc99d1e50ceac0b5f343b5819dc362685 Mon Sep 17 00:00:00 2001 From: faketruth Date: Fri, 16 Mar 2012 15:52:26 +0000 Subject: [PATCH] That didn't work.. I forgot some cChunk functions were changed. Now it should compile again git-svn-id: http://mc-server.googlecode.com/svn/trunk@417 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cChunk.h | 3 +++ source/cChunkMap.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/source/cChunk.h b/source/cChunk.h index ed15b696c..cb72ef594 100644 --- a/source/cChunk.h +++ b/source/cChunk.h @@ -167,6 +167,9 @@ public: inline BLOCKTYPE GetMeta(int a_RelX, int a_RelY, int a_RelZ) {return cChunkDef::GetNibble(m_BlockMeta, a_RelX, a_RelY, a_RelZ); } inline void SetMeta(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_Meta) { cChunkDef::SetNibble(m_BlockMeta, a_RelX, a_RelY, a_RelZ, a_Meta); } + inline BLOCKTYPE GetLight(int a_RelX, int a_RelY, int a_RelZ) {return cChunkDef::GetNibble(m_BlockLight, a_RelX, a_RelY, a_RelZ); } + inline BLOCKTYPE GetSkyLight(int a_RelX, int a_RelY, int a_RelZ) {return cChunkDef::GetNibble(m_BlockSkyLight, a_RelX, a_RelY, a_RelZ); } + private: friend class cChunkMap; diff --git a/source/cChunkMap.cpp b/source/cChunkMap.cpp index c36f2610f..33441a406 100644 --- a/source/cChunkMap.cpp +++ b/source/cChunkMap.cpp @@ -566,7 +566,7 @@ BLOCKTYPE cChunkMap::GetBlockSkyLight(int a_X, int a_Y, int a_Z) cChunkPtr Chunk = GetChunk( ChunkX, ZERO_CHUNK_Y, ChunkZ ); if ((Chunk != NULL) && Chunk->IsValid() ) { - return cChunk::GetNibble( Chunk->pGetSkyLight(), a_X, a_Y, a_Z ); + return Chunk->GetSkyLight( a_X, a_Y, a_Z ); } return 0; }