diff options
| author | Mattes D <github@xoft.cz> | 2016-07-19 10:15:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-19 10:15:49 +0200 |
| commit | c54691a3e578c0c33f0e196959a4c224883b1c93 (patch) | |
| tree | bb258a4eb246e062e3ad9b3cfa2119411bb1d4ac /src/Generating | |
| parent | Fixes for boat entities (#3265) (diff) | |
| parent | CMake: Silenced CMP0054 policy warning. (diff) | |
| download | cuberite-c54691a3e578c0c33f0e196959a4c224883b1c93.tar cuberite-c54691a3e578c0c33f0e196959a4c224883b1c93.tar.gz cuberite-c54691a3e578c0c33f0e196959a4c224883b1c93.tar.bz2 cuberite-c54691a3e578c0c33f0e196959a4c224883b1c93.tar.lz cuberite-c54691a3e578c0c33f0e196959a4c224883b1c93.tar.xz cuberite-c54691a3e578c0c33f0e196959a4c224883b1c93.tar.zst cuberite-c54691a3e578c0c33f0e196959a4c224883b1c93.zip | |
Diffstat (limited to 'src/Generating')
| -rw-r--r-- | src/Generating/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Generating/ChunkDesc.cpp | 2 | ||||
| -rw-r--r-- | src/Generating/ChunkDesc.h | 7 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/Generating/CMakeLists.txt b/src/Generating/CMakeLists.txt index dd346b6c4..8b0577129 100644 --- a/src/Generating/CMakeLists.txt +++ b/src/Generating/CMakeLists.txt @@ -1,5 +1,3 @@ - -cmake_minimum_required (VERSION 2.6) project (Cuberite) include_directories ("${PROJECT_SOURCE_DIR}/../") diff --git a/src/Generating/ChunkDesc.cpp b/src/Generating/ChunkDesc.cpp index fcbebf1ca..6ba63d5ce 100644 --- a/src/Generating/ChunkDesc.cpp +++ b/src/Generating/ChunkDesc.cpp @@ -72,7 +72,7 @@ void cChunkDesc::SetBlockTypeMeta(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE -void cChunkDesc::GetBlockTypeMeta(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta) +void cChunkDesc::GetBlockTypeMeta(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta) const { m_BlockArea.GetRelBlockTypeMeta(a_RelX, a_RelY, a_RelZ, a_BlockType, a_BlockMeta); } diff --git a/src/Generating/ChunkDesc.h b/src/Generating/ChunkDesc.h index aa689fcd6..9e3f4af5e 100644 --- a/src/Generating/ChunkDesc.h +++ b/src/Generating/ChunkDesc.h @@ -52,7 +52,12 @@ public: void FillBlocks(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta); void SetBlockTypeMeta(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); + + // tolua_end + /** Returns the BlockType and BlockMeta at the specified coords. + Exported to Lua manually to avoid extra parameters generated by ToLua++. */ + void GetBlockTypeMeta(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta) const; + // tolua_begin void SetBlockType(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_BlockType); BLOCKTYPE GetBlockType(int a_RelX, int a_RelY, int a_RelZ); |