summaryrefslogtreecommitdiffstats
path: root/src/BlockArea.h
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-04-01 20:50:10 +0200
committermadmaxoft <github@xoft.cz>2014-04-01 20:50:10 +0200
commit1229795ff0fd82412e780fffc9f37a2d6eed5522 (patch)
tree865b3ecec47d1cf669c738959f8729ac90ef1d74 /src/BlockArea.h
parentRemoved the exit-time-destructors flag from clang. (diff)
downloadcuberite-1229795ff0fd82412e780fffc9f37a2d6eed5522.tar
cuberite-1229795ff0fd82412e780fffc9f37a2d6eed5522.tar.gz
cuberite-1229795ff0fd82412e780fffc9f37a2d6eed5522.tar.bz2
cuberite-1229795ff0fd82412e780fffc9f37a2d6eed5522.tar.lz
cuberite-1229795ff0fd82412e780fffc9f37a2d6eed5522.tar.xz
cuberite-1229795ff0fd82412e780fffc9f37a2d6eed5522.tar.zst
cuberite-1229795ff0fd82412e780fffc9f37a2d6eed5522.zip
Diffstat (limited to 'src/BlockArea.h')
-rw-r--r--src/BlockArea.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/BlockArea.h b/src/BlockArea.h
index d37f0d182..34a0ef926 100644
--- a/src/BlockArea.h
+++ b/src/BlockArea.h
@@ -52,6 +52,7 @@ public:
msImprint,
msLake,
msSpongePrint,
+ msMask,
} ;
cBlockArea(void);
@@ -152,6 +153,14 @@ public:
+----------+--------+--------+
| A | sponge | A | Sponge is the NOP block
| * | B | B | Everything else overwrites anything
+
+ msMask:
+ Combines two areas, the blocks that are the same are kept, differing ones are reset to air
+ | area block | |
+ | this | Src | result |
+ +------+-------+--------+
+ | A | A | A | Same blocks are kept
+ | A | non-A | air | Everything else is replaced with air
*/
void Merge(const cBlockArea & a_Src, int a_RelX, int a_RelY, int a_RelZ, eMergeStrategy a_Strategy);