diff options
author | Mattes D <github@xoft.cz> | 2014-08-28 15:58:48 +0200 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2014-08-28 15:58:48 +0200 |
commit | 271c8c0d3246749087f9772df31896d93f2cb9f3 (patch) | |
tree | 996deeecb3fbf49f78ada88cea090ca2586fcbee /src/BlockArea.h | |
parent | Merge remote-tracking branch 'origin/master' into CraftingFixes (diff) | |
download | cuberite-271c8c0d3246749087f9772df31896d93f2cb9f3.tar cuberite-271c8c0d3246749087f9772df31896d93f2cb9f3.tar.gz cuberite-271c8c0d3246749087f9772df31896d93f2cb9f3.tar.bz2 cuberite-271c8c0d3246749087f9772df31896d93f2cb9f3.tar.lz cuberite-271c8c0d3246749087f9772df31896d93f2cb9f3.tar.xz cuberite-271c8c0d3246749087f9772df31896d93f2cb9f3.tar.zst cuberite-271c8c0d3246749087f9772df31896d93f2cb9f3.zip |
Diffstat (limited to 'src/BlockArea.h')
-rw-r--r-- | src/BlockArea.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/BlockArea.h b/src/BlockArea.h index a95ba7788..86f7c4f2d 100644 --- a/src/BlockArea.h +++ b/src/BlockArea.h @@ -362,7 +362,7 @@ protected: NIBBLETYPE a_BlockLight, NIBBLETYPE a_BlockSkyLight ); - template<bool MetasValid> + 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 } ; |