summaryrefslogtreecommitdiffstats
path: root/src/World.cpp
diff options
context:
space:
mode:
authortycho <work.tycho@gmail.com>2015-05-15 14:57:27 +0200
committertycho <work.tycho@gmail.com>2015-05-16 11:47:04 +0200
commitc96849f431bb4152a4258d2480bef8cd272e0c6e (patch)
tree0ca69086678f31818311cd9f9a3f00a094a425d9 /src/World.cpp
parentInitial implementation of IniFile overloading (diff)
downloadcuberite-c96849f431bb4152a4258d2480bef8cd272e0c6e.tar
cuberite-c96849f431bb4152a4258d2480bef8cd272e0c6e.tar.gz
cuberite-c96849f431bb4152a4258d2480bef8cd272e0c6e.tar.bz2
cuberite-c96849f431bb4152a4258d2480bef8cd272e0c6e.tar.lz
cuberite-c96849f431bb4152a4258d2480bef8cd272e0c6e.tar.xz
cuberite-c96849f431bb4152a4258d2480bef8cd272e0c6e.tar.zst
cuberite-c96849f431bb4152a4258d2480bef8cd272e0c6e.zip
Diffstat (limited to '')
-rw-r--r--src/World.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/World.cpp b/src/World.cpp
index c0a79b9d0..eb8835467 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -621,18 +621,18 @@ void cWorld::Start(void)
InitialiseAndLoadMobSpawningValues(IniFile);
SetTimeOfDay(IniFile.GetValueSetI("General", "TimeInTicks", GetTimeOfDay()));
- m_ChunkMap = make_unique<cChunkMap>(this);
+ m_ChunkMap = cpp14::make_unique<cChunkMap>(this);
// preallocate some memory for ticking blocks so we don't need to allocate that often
m_BlockTickQueue.reserve(1000);
m_BlockTickQueueCopy.reserve(1000);
// Simulators:
- m_SimulatorManager = make_unique<cSimulatorManager>(*this);
+ m_SimulatorManager = cpp14::make_unique<cSimulatorManager>(*this);
m_WaterSimulator = InitializeFluidSimulator(IniFile, "Water", E_BLOCK_WATER, E_BLOCK_STATIONARY_WATER);
m_LavaSimulator = InitializeFluidSimulator(IniFile, "Lava", E_BLOCK_LAVA, E_BLOCK_STATIONARY_LAVA);
- m_SandSimulator = make_unique<cSandSimulator>(*this, IniFile);
- m_FireSimulator = make_unique<cFireSimulator>(*this, IniFile);
+ m_SandSimulator = cpp14::make_unique<cSandSimulator>(*this, IniFile);
+ m_FireSimulator = cpp14::make_unique<cFireSimulator>(*this, IniFile);
m_RedstoneSimulator = InitializeRedstoneSimulator(IniFile);
// Water, Lava and Redstone simulators get registered in their initialize function.
@@ -2680,7 +2680,7 @@ void cWorld::UnloadUnusedChunks(void)
void cWorld::QueueUnloadUnusedChunks(void)
{
- QueueTask(make_unique<cWorld::cTaskUnloadUnusedChunks>());
+ QueueTask(cpp14::make_unique<cWorld::cTaskUnloadUnusedChunks>());
}