From e2f1cf51c759f0c70bc1dc9f1db3a8575e1db10f Mon Sep 17 00:00:00 2001 From: faketruth Date: Mon, 31 Oct 2011 00:52:20 +0000 Subject: Prepared some parts of the code for multi world support, I created lots of TODO's git-svn-id: http://mc-server.googlecode.com/svn/trunk@29 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cChunkMap.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source/cChunkMap.cpp') diff --git a/source/cChunkMap.cpp b/source/cChunkMap.cpp index 32bdf576a..44dfe3a29 100644 --- a/source/cChunkMap.cpp +++ b/source/cChunkMap.cpp @@ -19,12 +19,13 @@ #define LAYER_SIZE (32) -cChunkMap::cChunkMap( int a_Width, int a_Height ) +cChunkMap::cChunkMap( int a_Width, int a_Height, cWorld* a_World ) : m_Nodes( new cChunkNode[ a_Width * a_Height ] ) , m_Width( a_Width ) , m_Height( a_Height ) , m_Layers( 0 ) , m_NumLayers( 0 ) + , m_World( a_World ) { } @@ -362,7 +363,7 @@ cChunk* cChunkMap::GetChunk( int a_X, int a_Y, int a_Z ) } else { - cChunk* Chunk = new cChunk(a_X, a_Y, a_Z); + cChunk* Chunk = new cChunk(a_X, a_Y, a_Z, m_World); memcpy( Chunk->m_BlockData, BlockData, cChunk::c_BlockDataSize ); Chunk->CalculateHeightmap(); Data->m_LiveChunk = Chunk; @@ -426,7 +427,7 @@ void cChunkMap::Tick( float a_Dt ) void cChunkMap::UnloadUnusedChunks() { - cWorld* World = cRoot::Get()->GetWorld(); + cWorld* World = m_World; /* // OLD for( int i = 0; i < m_Width*m_Height; ++i ) { -- cgit v1.2.3