diff options
author | Alexander Harkness <me@bearbin.net> | 2015-05-19 11:53:44 +0200 |
---|---|---|
committer | Alexander Harkness <me@bearbin.net> | 2015-05-19 11:53:44 +0200 |
commit | fff5efedc331922bd871eddef886a75177e67d9a (patch) | |
tree | ea38ffc8455c2179ad8a817c5c988d2b68be2051 /src/World.cpp | |
parent | Removed tip4commit, it's not used anymore. (diff) | |
parent | Add support for setting ports through command line (diff) | |
download | cuberite-fff5efedc331922bd871eddef886a75177e67d9a.tar cuberite-fff5efedc331922bd871eddef886a75177e67d9a.tar.gz cuberite-fff5efedc331922bd871eddef886a75177e67d9a.tar.bz2 cuberite-fff5efedc331922bd871eddef886a75177e67d9a.tar.lz cuberite-fff5efedc331922bd871eddef886a75177e67d9a.tar.xz cuberite-fff5efedc331922bd871eddef886a75177e67d9a.tar.zst cuberite-fff5efedc331922bd871eddef886a75177e67d9a.zip |
Diffstat (limited to '')
-rw-r--r-- | src/World.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/World.cpp b/src/World.cpp index ced459da8..e93d6bb26 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>()); } |