From 76c39dad0fc7ab13b72f352195995537548a47ab Mon Sep 17 00:00:00 2001 From: Bond-009 Date: Tue, 21 Mar 2017 09:47:03 +0100 Subject: Added blocks that can be washed away by water (#3637) --- src/BlockInfo.cpp | 1 + src/Simulator/FluidSimulator.cpp | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/src/BlockInfo.cpp b/src/BlockInfo.cpp index fc739a60d..336f5a1e8 100644 --- a/src/BlockInfo.cpp +++ b/src/BlockInfo.cpp @@ -338,6 +338,7 @@ void cBlockInfo::Initialize(cBlockInfoArray & a_Info) a_Info[E_BLOCK_TNT ].m_OneHitDig = true; a_Info[E_BLOCK_TALL_GRASS ].m_OneHitDig = true; a_Info[E_BLOCK_TORCH ].m_OneHitDig = true; + a_Info[E_BLOCK_TRIPWIRE_HOOK ].m_OneHitDig = true; a_Info[E_BLOCK_TRIPWIRE ].m_OneHitDig = true; diff --git a/src/Simulator/FluidSimulator.cpp b/src/Simulator/FluidSimulator.cpp index a1b14044b..10f2ed544 100644 --- a/src/Simulator/FluidSimulator.cpp +++ b/src/Simulator/FluidSimulator.cpp @@ -31,14 +31,22 @@ bool cFluidSimulator::CanWashAway(BLOCKTYPE a_BlockType) { switch (a_BlockType) { + case E_BLOCK_ACTIVATOR_RAIL: + case E_BLOCK_ACTIVE_COMPARATOR: case E_BLOCK_BEETROOTS: + case E_BLOCK_BIG_FLOWER: case E_BLOCK_BROWN_MUSHROOM: case E_BLOCK_CACTUS: case E_BLOCK_COBWEB: case E_BLOCK_CROPS: case E_BLOCK_DEAD_BUSH: + case E_BLOCK_DETECTOR_RAIL: + case E_BLOCK_INACTIVE_COMPARATOR: case E_BLOCK_LILY_PAD: + case E_BLOCK_POWERED_RAIL: case E_BLOCK_RAIL: + case E_BLOCK_REDSTONE_REPEATER_OFF: + case E_BLOCK_REDSTONE_REPEATER_ON: case E_BLOCK_REDSTONE_TORCH_OFF: case E_BLOCK_REDSTONE_TORCH_ON: case E_BLOCK_REDSTONE_WIRE: @@ -48,6 +56,8 @@ bool cFluidSimulator::CanWashAway(BLOCKTYPE a_BlockType) case E_BLOCK_SUGARCANE: case E_BLOCK_TALL_GRASS: case E_BLOCK_TORCH: + case E_BLOCK_TRIPWIRE_HOOK: + case E_BLOCK_TRIPWIRE: case E_BLOCK_YELLOW_FLOWER: { return true; -- cgit v1.2.3