summaryrefslogtreecommitdiffstats
path: root/src/World.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-12-17 08:38:23 +0100
committerMattes D <github@xoft.cz>2014-12-17 08:38:23 +0100
commit4947880a5d75d827b23f2ea359d9219043a32fcd (patch)
tree7167c17bec4ce486238575f7c158384e5776aa20 /src/World.cpp
parentUpdated Core. (diff)
parentNULL -> nullptr (diff)
downloadcuberite-4947880a5d75d827b23f2ea359d9219043a32fcd.tar
cuberite-4947880a5d75d827b23f2ea359d9219043a32fcd.tar.gz
cuberite-4947880a5d75d827b23f2ea359d9219043a32fcd.tar.bz2
cuberite-4947880a5d75d827b23f2ea359d9219043a32fcd.tar.lz
cuberite-4947880a5d75d827b23f2ea359d9219043a32fcd.tar.xz
cuberite-4947880a5d75d827b23f2ea359d9219043a32fcd.tar.zst
cuberite-4947880a5d75d827b23f2ea359d9219043a32fcd.zip
Diffstat (limited to 'src/World.cpp')
-rw-r--r--src/World.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/World.cpp b/src/World.cpp
index 8050e6607..69b39f831 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -3386,7 +3386,7 @@ void cWorld::SetChunkAlwaysTicked(int a_ChunkX, int a_ChunkZ, bool a_AlwaysTicke
-cRedstoneSimulator<cChunk, cWorld> * cWorld::InitializeRedstoneSimulator(cIniFile & a_IniFile)
+cRedstoneSimulator * cWorld::InitializeRedstoneSimulator(cIniFile & a_IniFile)
{
AString SimulatorName = a_IniFile.GetValueSet("Physics", "RedstoneSimulator", "Incremental");
@@ -3396,11 +3396,11 @@ cRedstoneSimulator<cChunk, cWorld> * cWorld::InitializeRedstoneSimulator(cIniFil
SimulatorName = "Incremental";
}
- cRedstoneSimulator<cChunk, cWorld> * res = nullptr;
+ cRedstoneSimulator * res = nullptr;
if (NoCaseCompare(SimulatorName, "Incremental") == 0)
{
- res = MakeIncrementalRedstoneSimulator(*this);
+ res = new cIncrementalRedstoneSimulator(*this);
}
else if (NoCaseCompare(SimulatorName, "noop") == 0)
{