diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-03-14 21:03:42 +0100 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-03-14 21:03:42 +0100 |
| commit | 68b1aa23b0493ac5964fca88234f374b5f8a7db5 (patch) | |
| tree | 0a976c9151be2fea43be0174432b0600714522d3 | |
| parent | Fix for the Vaporize fluid simulator when loading chunks. (diff) | |
| download | cuberite-68b1aa23b0493ac5964fca88234f374b5f8a7db5.tar cuberite-68b1aa23b0493ac5964fca88234f374b5f8a7db5.tar.gz cuberite-68b1aa23b0493ac5964fca88234f374b5f8a7db5.tar.bz2 cuberite-68b1aa23b0493ac5964fca88234f374b5f8a7db5.tar.lz cuberite-68b1aa23b0493ac5964fca88234f374b5f8a7db5.tar.xz cuberite-68b1aa23b0493ac5964fca88234f374b5f8a7db5.tar.zst cuberite-68b1aa23b0493ac5964fca88234f374b5f8a7db5.zip | |
| -rw-r--r-- | VC2008/MCServer.vcproj | 4 | ||||
| -rw-r--r-- | source/Simulator/NoopFluidSimulator.h | 36 | ||||
| -rw-r--r-- | source/World.cpp | 10 |
3 files changed, 50 insertions, 0 deletions
diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj index 3169e0dd7..cab4872c9 100644 --- a/VC2008/MCServer.vcproj +++ b/VC2008/MCServer.vcproj @@ -1107,6 +1107,10 @@ >
</File>
<File
+ RelativePath="..\source\Simulator\NoopFluidSimulator.h"
+ >
+ </File>
+ <File
RelativePath="..\source\Simulator\RedstoneSimulator.cpp"
>
</File>
diff --git a/source/Simulator/NoopFluidSimulator.h b/source/Simulator/NoopFluidSimulator.h new file mode 100644 index 000000000..9120fe868 --- /dev/null +++ b/source/Simulator/NoopFluidSimulator.h @@ -0,0 +1,36 @@ +
+// NoopFluidSimulator.h
+
+// Declares the cNoopFluidSimulator class representing a fluid simulator that performs nothing, it ignores all blocks
+
+
+
+
+
+#pragma once
+
+#include "FluidSimulator.h"
+
+
+
+
+
+class cNoopFluidSimulator :
+ public cFluidSimulator
+{
+ typedef cFluidSimulator super;
+
+public:
+ cNoopFluidSimulator(cWorld & a_World, BLOCKTYPE a_Fluid, BLOCKTYPE a_StationaryFluid) :
+ super(a_World, a_Fluid, a_StationaryFluid)
+ {
+ }
+
+ // cSimulator overrides:
+ virtual void AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) override {}
+ virtual void Simulate(float a_Dt) override {}
+} ;
+
+
+
+
diff --git a/source/World.cpp b/source/World.cpp index a82b4078b..81aa2e6f7 100644 --- a/source/World.cpp +++ b/source/World.cpp @@ -19,6 +19,7 @@ #include "Simulator/FloodyFluidSimulator.h" #include "Simulator/FluidSimulator.h" #include "Simulator/FireSimulator.h" +#include "Simulator/NoopFluidSimulator.h" #include "Simulator/SandSimulator.h" #include "Simulator/RedstoneSimulator.h" #include "Simulator/VaporizeFluidSimulator.h" @@ -2252,6 +2253,15 @@ cFluidSimulator * cWorld::InitializeFluidSimulator(cIniFile & a_IniFile, const c { res = new cVaporizeFluidSimulator(*this, a_SimulateBlock, a_StationaryBlock); } + else if ( + (NoCaseCompare(SimulatorName, "noop") == 0) || + (NoCaseCompare(SimulatorName, "nop") == 0) || + (NoCaseCompare(SimulatorName, "null") == 0) || + (NoCaseCompare(SimulatorName, "nil") == 0) + ) + { + res = new cNoopFluidSimulator(*this, a_SimulateBlock, a_StationaryBlock); + } else { if (NoCaseCompare(SimulatorName, "classic") != 0) |