From a2ffa432b31096f2533ecb50f49ba450b29a2989 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sun, 1 Sep 2019 09:30:00 +0200 Subject: Separated chunk generator from world / plugin interfaces. The generator now only takes care of servicing synchronous "GetChunk(X, Y)" and "GetBiomes(X, Y)" requests. --- src/Generating/ChunkDesc.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'src/Generating/ChunkDesc.h') diff --git a/src/Generating/ChunkDesc.h b/src/Generating/ChunkDesc.h index 709fccb70..997b640a3 100644 --- a/src/Generating/ChunkDesc.h +++ b/src/Generating/ChunkDesc.h @@ -39,15 +39,21 @@ public: typedef NIBBLETYPE BlockNibbleBytes[cChunkDef::NumBlocks]; - cChunkDesc(int a_ChunkX, int a_ChunkZ); + cChunkDesc(cChunkCoords a_Coords); ~cChunkDesc(); - void SetChunkCoords(int a_ChunkX, int a_ChunkZ); + void SetChunkCoords(cChunkCoords a_Coords); // tolua_begin - int GetChunkX(void) const { return m_ChunkX; } - int GetChunkZ(void) const { return m_ChunkZ; } + int GetChunkX() const { return m_Coords.m_ChunkX; } // Prefer GetChunkCoords() instead + int GetChunkZ() const { return m_Coords.m_ChunkZ; } // Prefer GetChunkCoords() instead + + // tolua_end + + cChunkCoords GetChunkCoords() const { return m_Coords; } + + // tolua_begin void FillBlocks(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta); void SetBlockTypeMeta(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta); @@ -225,8 +231,7 @@ public: #endif // _DEBUG private: - int m_ChunkX; - int m_ChunkZ; + cChunkCoords m_Coords; cChunkDef::BiomeMap m_BiomeMap; cBlockArea m_BlockArea; -- cgit v1.2.3