diff options
| author | Mattes D <github@xoft.cz> | 2015-07-31 16:49:10 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2015-07-31 16:49:10 +0200 |
| commit | 6e4122e551eeb41d3e950b363dd837d5586fe560 (patch) | |
| tree | b5ee221d8a8e63c7d3b7868da1db19bf717a6ffd /src/BlockArea.cpp | |
| parent | Merge pull request #2400 from cuberite/OffloadBadChunks (diff) | |
| download | cuberite-6e4122e551eeb41d3e950b363dd837d5586fe560.tar cuberite-6e4122e551eeb41d3e950b363dd837d5586fe560.tar.gz cuberite-6e4122e551eeb41d3e950b363dd837d5586fe560.tar.bz2 cuberite-6e4122e551eeb41d3e950b363dd837d5586fe560.tar.lz cuberite-6e4122e551eeb41d3e950b363dd837d5586fe560.tar.xz cuberite-6e4122e551eeb41d3e950b363dd837d5586fe560.tar.zst cuberite-6e4122e551eeb41d3e950b363dd837d5586fe560.zip | |
Diffstat (limited to 'src/BlockArea.cpp')
| -rw-r--r-- | src/BlockArea.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/BlockArea.cpp b/src/BlockArea.cpp index eb25d624d..761a7b355 100644 --- a/src/BlockArea.cpp +++ b/src/BlockArea.cpp @@ -26,8 +26,8 @@ typedef void (CombinatorFunc)(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBBLETYPE & a_DstMeta, NIBBLETYPE a_SrcMeta); -// This wild construct allows us to pass a function argument and still have it inlined by the compiler :) -/// Merges two blocktypes and blockmetas of the specified sizes and offsets using the specified combinator function +/** Merges two blocktypes and blockmetas of the specified sizes and offsets using the specified combinator function +This wild construct allows us to pass a function argument and still have it inlined by the compiler. */ template <bool MetasValid, CombinatorFunc Combinator> void InternalMergeBlocks( BLOCKTYPE * a_DstTypes, const BLOCKTYPE * a_SrcTypes, @@ -73,7 +73,7 @@ void InternalMergeBlocks( -/// Combinator used for cBlockArea::msOverwrite merging +/** Combinator used for cBlockArea::msOverwrite merging */ template <bool MetaValid> void MergeCombinatorOverwrite(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBBLETYPE & a_DstMeta, NIBBLETYPE a_SrcMeta) { @@ -88,7 +88,7 @@ void MergeCombinatorOverwrite(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBBLE -/// Combinator used for cBlockArea::msFillAir merging +/** Combinator used for cBlockArea::msFillAir merging */ template <bool MetaValid> void MergeCombinatorFillAir(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBBLETYPE & a_DstMeta, NIBBLETYPE a_SrcMeta) { @@ -107,7 +107,7 @@ void MergeCombinatorFillAir(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBBLETY -/// Combinator used for cBlockArea::msImprint merging +/** Combinator used for cBlockArea::msImprint merging */ template <bool MetaValid> void MergeCombinatorImprint(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBBLETYPE & a_DstMeta, NIBBLETYPE a_SrcMeta) { @@ -126,7 +126,7 @@ void MergeCombinatorImprint(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBBLETY -/// Combinator used for cBlockArea::msLake merging +/** Combinator used for cBlockArea::msLake merging */ template <bool MetaValid> void MergeCombinatorLake(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBBLETYPE & a_DstMeta, NIBBLETYPE a_SrcMeta) { |