diff options
author | Tycho <work.tycho+git@gmail.com> | 2014-04-05 23:12:17 +0200 |
---|---|---|
committer | Tycho <work.tycho+git@gmail.com> | 2014-04-05 23:12:17 +0200 |
commit | 23395a5ce1daab24465d607575c09e06e5b7c449 (patch) | |
tree | 18555c220fc6e602b071a935b190ef25444f18a9 /src/Blocks/BlockVine.h | |
parent | Fixed tolua++ override support (diff) | |
parent | Fixed Endiannes conversion routines for floats and doubles. (diff) | |
download | cuberite-23395a5ce1daab24465d607575c09e06e5b7c449.tar cuberite-23395a5ce1daab24465d607575c09e06e5b7c449.tar.gz cuberite-23395a5ce1daab24465d607575c09e06e5b7c449.tar.bz2 cuberite-23395a5ce1daab24465d607575c09e06e5b7c449.tar.lz cuberite-23395a5ce1daab24465d607575c09e06e5b7c449.tar.xz cuberite-23395a5ce1daab24465d607575c09e06e5b7c449.tar.zst cuberite-23395a5ce1daab24465d607575c09e06e5b7c449.zip |
Diffstat (limited to 'src/Blocks/BlockVine.h')
-rw-r--r-- | src/Blocks/BlockVine.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/Blocks/BlockVine.h b/src/Blocks/BlockVine.h index 8041d9359..7bb9dc484 100644 --- a/src/Blocks/BlockVine.h +++ b/src/Blocks/BlockVine.h @@ -1,7 +1,7 @@ #pragma once #include "BlockHandler.h" -#include "MetaRotater.h" +#include "MetaRotator.h" @@ -83,7 +83,7 @@ public: static const struct { int x, z; - int Bit; + NIBBLETYPE Bit; } Coords[] = { { 0, 1, 1}, // south, ZP @@ -91,7 +91,7 @@ public: { 0, -1, 4}, // north, ZM { 1, 0, 8}, // east, XP } ; - int res = 0; + NIBBLETYPE res = 0; for (size_t i = 0; i < ARRAYCOUNT(Coords); i++) { BLOCKTYPE BlockType; @@ -175,7 +175,10 @@ public: a_Chunk.UnboundedRelGetBlockType(a_RelX, a_RelY - 1, a_RelZ, Block); if (Block == E_BLOCK_AIR) { - a_Chunk.UnboundedRelSetBlock(a_RelX, a_RelY - 1, a_RelZ, E_BLOCK_VINES, a_Chunk.GetMeta(a_RelX, a_RelY, a_RelZ)); + if (!cRoot::Get()->GetPluginManager()->CallHookBlockSpread((cWorld*) &a_WorldInterface, a_RelX * cChunkDef::Width, a_RelY - 1, a_RelZ * cChunkDef::Width, ssVineSpread)) + { + a_Chunk.UnboundedRelSetBlock(a_RelX, a_RelY - 1, a_RelZ, E_BLOCK_VINES, a_Chunk.GetMeta(a_RelX, a_RelY, a_RelZ)); + } } } @@ -194,14 +197,14 @@ public: virtual NIBBLETYPE MetaMirrorXY(NIBBLETYPE a_Meta) override { // Bits 2 and 4 stay, bits 1 and 3 swap - return ((a_Meta & 0x0a) | ((a_Meta & 0x01) << 2) | ((a_Meta & 0x04) >> 2)); + return (NIBBLETYPE)((a_Meta & 0x0a) | ((a_Meta & 0x01) << 2) | ((a_Meta & 0x04) >> 2)); } virtual NIBBLETYPE MetaMirrorYZ(NIBBLETYPE a_Meta) override { // Bits 1 and 3 stay, bits 2 and 4 swap - return ((a_Meta & 0x05) | ((a_Meta & 0x02) << 2) | ((a_Meta & 0x08) >> 2)); + return (NIBBLETYPE)((a_Meta & 0x05) | ((a_Meta & 0x02) << 2) | ((a_Meta & 0x08) >> 2)); } } ; |