diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-06-12 19:56:48 +0200 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-06-12 19:56:48 +0200 |
| commit | c82f4f6309f760186c43b4f32596c3e78a5725b7 (patch) | |
| tree | 6aa16d752970f2d2ba2f6f5877a0db2f3ae70fae | |
| parent | Removed unnessicary indirection from Entity iterator list (diff) | |
| download | cuberite-c82f4f6309f760186c43b4f32596c3e78a5725b7.tar cuberite-c82f4f6309f760186c43b4f32596c3e78a5725b7.tar.gz cuberite-c82f4f6309f760186c43b4f32596c3e78a5725b7.tar.bz2 cuberite-c82f4f6309f760186c43b4f32596c3e78a5725b7.tar.lz cuberite-c82f4f6309f760186c43b4f32596c3e78a5725b7.tar.xz cuberite-c82f4f6309f760186c43b4f32596c3e78a5725b7.tar.zst cuberite-c82f4f6309f760186c43b4f32596c3e78a5725b7.zip | |
| -rw-r--r-- | src/Chunk.cpp | 4 | ||||
| -rw-r--r-- | src/World.cpp | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/Chunk.cpp b/src/Chunk.cpp index 7ca0a4afd..8255fdcaf 100644 --- a/src/Chunk.cpp +++ b/src/Chunk.cpp @@ -71,6 +71,7 @@ cChunk::cChunk( m_IsDirty(false), m_IsSaving(false), m_HasLoadFailed(false), + m_EntityTickIteratorData(std::make_pair(false, m_Entities.end())), m_StayCount(0), m_PosX(a_ChunkX), m_PosY(a_ChunkY), @@ -85,8 +86,7 @@ cChunk::cChunk( m_NeighborZM(a_NeighborZM), m_NeighborZP(a_NeighborZP), m_WaterSimulatorData(a_World->GetWaterSimulator()->CreateChunkData()), - m_LavaSimulatorData (a_World->GetLavaSimulator ()->CreateChunkData()), - m_EntityTickIteratorData(std::make_pair(false, m_Entities.end())) + m_LavaSimulatorData (a_World->GetLavaSimulator ()->CreateChunkData()) { if (a_NeighborXM != NULL) { diff --git a/src/World.cpp b/src/World.cpp index c86827080..3ed2f5f13 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -234,6 +234,7 @@ void cWorld::cTickThread::Execute(void) cWorld::cWorld(const AString & a_WorldName, eDimension a_Dimension, const AString & a_OverworldName) : m_WorldName(a_WorldName), + m_OverworldName(a_OverworldName), m_IniFileName(m_WorldName + "/world.ini"), m_StorageSchema("Default"), #ifdef __arm__ @@ -241,6 +242,7 @@ cWorld::cWorld(const AString & a_WorldName, eDimension a_Dimension, const AStrin #else m_StorageCompressionFactor(6), #endif + m_Dimension(a_Dimension), m_IsSpawnExplicitlySet(false), m_WorldAgeSecs(0), m_TimeOfDaySecs(0), @@ -253,9 +255,8 @@ cWorld::cWorld(const AString & a_WorldName, eDimension a_Dimension, const AStrin m_Scoreboard(this), m_MapManager(this), m_GeneratorCallbacks(*this), - m_TickThread(*this), - m_Dimension(a_Dimension), - m_OverworldName(a_OverworldName) + m_TickThread(*this) + { LOGD("cWorld::cWorld(\"%s\")", a_WorldName.c_str()); |