summaryrefslogtreecommitdiffstats
path: root/src/BlockArea.h
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-04-28 19:31:07 +0200
committerTycho <work.tycho+git@gmail.com>2014-04-28 19:31:07 +0200
commita42480cf8266a1e066209823aab42c9a3829adbc (patch)
tree8b73109b66b74ca1bc39f4d29e2c4e428b85ccaf /src/BlockArea.h
parentWorked around const pointer (diff)
downloadcuberite-a42480cf8266a1e066209823aab42c9a3829adbc.tar
cuberite-a42480cf8266a1e066209823aab42c9a3829adbc.tar.gz
cuberite-a42480cf8266a1e066209823aab42c9a3829adbc.tar.bz2
cuberite-a42480cf8266a1e066209823aab42c9a3829adbc.tar.lz
cuberite-a42480cf8266a1e066209823aab42c9a3829adbc.tar.xz
cuberite-a42480cf8266a1e066209823aab42c9a3829adbc.tar.zst
cuberite-a42480cf8266a1e066209823aab42c9a3829adbc.zip
Diffstat (limited to '')
-rw-r--r--src/BlockArea.h5
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