diff options
| author | madmaxoft <github@xoft.cz> | 2014-04-28 20:16:37 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-04-28 20:16:37 +0200 |
| commit | 8ae472df864786417ce3e9ed8df186da2960bc02 (patch) | |
| tree | aecc48e1051d91638ed84250ec06ef764f12a2ab /src/BlockArea.h | |
| parent | Merge pull request #954 from mc-server/projectiles-split (diff) | |
| parent | Removed static from combinators. (diff) | |
| download | cuberite-8ae472df864786417ce3e9ed8df186da2960bc02.tar cuberite-8ae472df864786417ce3e9ed8df186da2960bc02.tar.gz cuberite-8ae472df864786417ce3e9ed8df186da2960bc02.tar.bz2 cuberite-8ae472df864786417ce3e9ed8df186da2960bc02.tar.lz cuberite-8ae472df864786417ce3e9ed8df186da2960bc02.tar.xz cuberite-8ae472df864786417ce3e9ed8df186da2960bc02.tar.zst cuberite-8ae472df864786417ce3e9ed8df186da2960bc02.zip | |
Diffstat (limited to 'src/BlockArea.h')
| -rw-r--r-- | src/BlockArea.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/BlockArea.h b/src/BlockArea.h index c48175b8c..4c4dfb8ff 100644 --- a/src/BlockArea.h +++ b/src/BlockArea.h @@ -294,7 +294,7 @@ public: NIBBLETYPE * GetBlockMetas (void) const { return m_BlockMetas; } // NOTE: one byte per block! NIBBLETYPE * GetBlockLight (void) const { return m_BlockLight; } // NOTE: one byte per block! NIBBLETYPE * GetBlockSkyLight(void) const { return m_BlockSkyLight; } // NOTE: one byte per block! - int GetBlockCount(void) const { return m_Size.x * m_Size.y * m_Size.z; } + size_t GetBlockCount(void) const { return m_Size.x * m_Size.y * m_Size.z; } int MakeIndex(int a_RelX, int a_RelY, int a_RelZ) const; protected: @@ -363,6 +363,9 @@ protected: int a_DataTypes, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, NIBBLETYPE a_BlockLight, NIBBLETYPE a_BlockSkyLight ); + + template<bool MetasValid> + void MergeByStrategy(const cBlockArea & a_Src, int a_RelX, int a_RelY, int a_RelZ, eMergeStrategy a_Strategy, const NIBBLETYPE * SrcMetas, NIBBLETYPE * DstMetas); // tolua_begin } ; // tolua_end |