Fixed order of initalisation
This commit is contained in:
parent
93d4a8aa92
commit
c82f4f6309
@ -71,6 +71,7 @@ cChunk::cChunk(
|
|||||||
m_IsDirty(false),
|
m_IsDirty(false),
|
||||||
m_IsSaving(false),
|
m_IsSaving(false),
|
||||||
m_HasLoadFailed(false),
|
m_HasLoadFailed(false),
|
||||||
|
m_EntityTickIteratorData(std::make_pair(false, m_Entities.end())),
|
||||||
m_StayCount(0),
|
m_StayCount(0),
|
||||||
m_PosX(a_ChunkX),
|
m_PosX(a_ChunkX),
|
||||||
m_PosY(a_ChunkY),
|
m_PosY(a_ChunkY),
|
||||||
@ -85,8 +86,7 @@ cChunk::cChunk(
|
|||||||
m_NeighborZM(a_NeighborZM),
|
m_NeighborZM(a_NeighborZM),
|
||||||
m_NeighborZP(a_NeighborZP),
|
m_NeighborZP(a_NeighborZP),
|
||||||
m_WaterSimulatorData(a_World->GetWaterSimulator()->CreateChunkData()),
|
m_WaterSimulatorData(a_World->GetWaterSimulator()->CreateChunkData()),
|
||||||
m_LavaSimulatorData (a_World->GetLavaSimulator ()->CreateChunkData()),
|
m_LavaSimulatorData (a_World->GetLavaSimulator ()->CreateChunkData())
|
||||||
m_EntityTickIteratorData(std::make_pair(false, m_Entities.end()))
|
|
||||||
{
|
{
|
||||||
if (a_NeighborXM != NULL)
|
if (a_NeighborXM != NULL)
|
||||||
{
|
{
|
||||||
|
@ -234,6 +234,7 @@ void cWorld::cTickThread::Execute(void)
|
|||||||
|
|
||||||
cWorld::cWorld(const AString & a_WorldName, eDimension a_Dimension, const AString & a_OverworldName) :
|
cWorld::cWorld(const AString & a_WorldName, eDimension a_Dimension, const AString & a_OverworldName) :
|
||||||
m_WorldName(a_WorldName),
|
m_WorldName(a_WorldName),
|
||||||
|
m_OverworldName(a_OverworldName),
|
||||||
m_IniFileName(m_WorldName + "/world.ini"),
|
m_IniFileName(m_WorldName + "/world.ini"),
|
||||||
m_StorageSchema("Default"),
|
m_StorageSchema("Default"),
|
||||||
#ifdef __arm__
|
#ifdef __arm__
|
||||||
@ -241,6 +242,7 @@ cWorld::cWorld(const AString & a_WorldName, eDimension a_Dimension, const AStrin
|
|||||||
#else
|
#else
|
||||||
m_StorageCompressionFactor(6),
|
m_StorageCompressionFactor(6),
|
||||||
#endif
|
#endif
|
||||||
|
m_Dimension(a_Dimension),
|
||||||
m_IsSpawnExplicitlySet(false),
|
m_IsSpawnExplicitlySet(false),
|
||||||
m_WorldAgeSecs(0),
|
m_WorldAgeSecs(0),
|
||||||
m_TimeOfDaySecs(0),
|
m_TimeOfDaySecs(0),
|
||||||
@ -253,9 +255,8 @@ cWorld::cWorld(const AString & a_WorldName, eDimension a_Dimension, const AStrin
|
|||||||
m_Scoreboard(this),
|
m_Scoreboard(this),
|
||||||
m_MapManager(this),
|
m_MapManager(this),
|
||||||
m_GeneratorCallbacks(*this),
|
m_GeneratorCallbacks(*this),
|
||||||
m_TickThread(*this),
|
m_TickThread(*this)
|
||||||
m_Dimension(a_Dimension),
|
|
||||||
m_OverworldName(a_OverworldName)
|
|
||||||
{
|
{
|
||||||
LOGD("cWorld::cWorld(\"%s\")", a_WorldName.c_str());
|
LOGD("cWorld::cWorld(\"%s\")", a_WorldName.c_str());
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user