diff options
| author | STRWarrior <niels.breuker@hotmail.nl> | 2014-02-07 22:59:08 +0100 |
|---|---|---|
| committer | STRWarrior <niels.breuker@hotmail.nl> | 2014-02-07 22:59:08 +0100 |
| commit | 3a897844a0796ce91e51e0154acbbce2d8e807e5 (patch) | |
| tree | 395c3322c924d61d4cbf8b82d5c7cbb2f6357d1a /src/World.cpp | |
| parent | Fixed some end of lines (diff) | |
| download | cuberite-3a897844a0796ce91e51e0154acbbce2d8e807e5.tar cuberite-3a897844a0796ce91e51e0154acbbce2d8e807e5.tar.gz cuberite-3a897844a0796ce91e51e0154acbbce2d8e807e5.tar.bz2 cuberite-3a897844a0796ce91e51e0154acbbce2d8e807e5.tar.lz cuberite-3a897844a0796ce91e51e0154acbbce2d8e807e5.tar.xz cuberite-3a897844a0796ce91e51e0154acbbce2d8e807e5.tar.zst cuberite-3a897844a0796ce91e51e0154acbbce2d8e807e5.zip | |
Diffstat (limited to 'src/World.cpp')
| -rw-r--r-- | src/World.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/World.cpp b/src/World.cpp index 1343d5ad6..a02767575 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -31,7 +31,7 @@ #include "Simulator/NoopFluidSimulator.h" #include "Simulator/NoopRedstoneSimulator.h" #include "Simulator/SandSimulator.h" -#include "Simulator/RedstoneSimulator.h" +#include "Simulator/IncrementalRedstoneSimulator.h" #include "Simulator/VaporizeFluidSimulator.h" // Mobs: @@ -2871,27 +2871,23 @@ void cWorld::TabCompleteUserName(const AString & a_Text, AStringVector & a_Resul -cRedstoneManager * cWorld::InitializeRedstoneSimulator(cIniFile & a_IniFile) +cRedstoneSimulator * cWorld::InitializeRedstoneSimulator(cIniFile & a_IniFile) { AString SimulatorName = a_IniFile.GetValueSet("Physics", "RedstoneSimulator", ""); if (SimulatorName.empty()) { - LOGWARNING("[Physics] RedstoneSimulator not present or empty in %s, using the default of \"Floody\".", GetIniFileName().c_str()); - SimulatorName = "redstone"; + LOGWARNING("[Physics] RedstoneSimulator not present or empty in %s, using the default of \"incremental\".", GetIniFileName().c_str()); + SimulatorName = "incremental"; } - cRedstoneManager * res = NULL; + cRedstoneSimulator * res = NULL; - if ( - (NoCaseCompare(SimulatorName, "redstone") == 0) - ) + if (NoCaseCompare(SimulatorName, "incremental") == 0) { - res = new cRedstoneSimulator(*this); + res = new cIncrementalRedstoneSimulator(*this); } - else if ( - (NoCaseCompare(SimulatorName, "noop") == 0) - ) + else if (NoCaseCompare(SimulatorName, "noop") == 0) { res = new cRedstoneNoopSimulator(*this); } |