summaryrefslogtreecommitdiffstats
path: root/src/Simulator
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/Simulator/DelayedFluidSimulator.cpp2
-rw-r--r--src/Simulator/Simulator.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Simulator/DelayedFluidSimulator.cpp b/src/Simulator/DelayedFluidSimulator.cpp
index ec1918617..9bec01359 100644
--- a/src/Simulator/DelayedFluidSimulator.cpp
+++ b/src/Simulator/DelayedFluidSimulator.cpp
@@ -121,7 +121,7 @@ void cDelayedFluidSimulator::SimulateChunk(std::chrono::milliseconds a_Dt, int a
void cDelayedFluidSimulator::AddBlock(cChunk & a_Chunk, Vector3i a_Position, BLOCKTYPE a_Block)
{
- if (a_Block != m_FluidBlock)
+ if ((a_Block != m_FluidBlock) && (a_Block != m_StationaryFluidBlock))
{
return;
}
diff --git a/src/Simulator/Simulator.h b/src/Simulator/Simulator.h
index f82b579cb..e18465bee 100644
--- a/src/Simulator/Simulator.h
+++ b/src/Simulator/Simulator.h
@@ -28,7 +28,7 @@ public:
virtual ~cSimulator() {}
// Contains our direct adjacents
- inline static std::array<Vector3i, 6> AdjacentOffsets
+ static constexpr std::array<Vector3i, 6> AdjacentOffsets
{
{
{ 1, 0, 0 },