summaryrefslogtreecommitdiffstats
path: root/src/BlockArea.h
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-04-02 15:37:24 +0200
committerTycho <work.tycho+git@gmail.com>2014-04-02 15:37:24 +0200
commit741a64c250a1085108f24f351e9d9dacd085cc82 (patch)
treea69b5aba676473e5f75822a02e14e2acc542b263 /src/BlockArea.h
parentFixed All signedness warnings in HTTPServer.cpp (diff)
parentMerge branch 'master' into globals (diff)
downloadcuberite-741a64c250a1085108f24f351e9d9dacd085cc82.tar
cuberite-741a64c250a1085108f24f351e9d9dacd085cc82.tar.gz
cuberite-741a64c250a1085108f24f351e9d9dacd085cc82.tar.bz2
cuberite-741a64c250a1085108f24f351e9d9dacd085cc82.tar.lz
cuberite-741a64c250a1085108f24f351e9d9dacd085cc82.tar.xz
cuberite-741a64c250a1085108f24f351e9d9dacd085cc82.tar.zst
cuberite-741a64c250a1085108f24f351e9d9dacd085cc82.zip
Diffstat (limited to 'src/BlockArea.h')
-rw-r--r--src/BlockArea.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/BlockArea.h b/src/BlockArea.h
index d37f0d182..c48175b8c 100644
--- a/src/BlockArea.h
+++ b/src/BlockArea.h
@@ -52,6 +52,8 @@ public:
msImprint,
msLake,
msSpongePrint,
+ msDifference,
+ msMask,
} ;
cBlockArea(void);
@@ -152,6 +154,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);