From 7c0a7d662daec45a44bdf598735d1600bf7c187d Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Fri, 8 Feb 2013 16:01:44 +0000 Subject: Prepared cChunkDesc for further API extension; used it as the sole container for generated chunk data, including entities / block entities. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1200 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Generating/ComposableGenerator.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/Generating/ComposableGenerator.cpp') diff --git a/source/Generating/ComposableGenerator.cpp b/source/Generating/ComposableGenerator.cpp index a758d5049..793d6a449 100644 --- a/source/Generating/ComposableGenerator.cpp +++ b/source/Generating/ComposableGenerator.cpp @@ -88,14 +88,14 @@ void cComposableGenerator::GenerateBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef: -void cComposableGenerator::DoGenerate(int a_ChunkX, int a_ChunkZ, cChunkDesc & a_ChunkDesc, cEntityList & a_Entities, cBlockEntityList & a_BlockEntities) +void cComposableGenerator::DoGenerate(int a_ChunkX, int a_ChunkZ, cChunkDesc & a_ChunkDesc) { cChunkDef::BiomeMap & BiomeMap = a_ChunkDesc.GetBiomeMap(); cChunkDef::BlockTypes & BlockTypes = a_ChunkDesc.GetBlockTypes(); cChunkDef::BlockNibbles & BlockMeta = a_ChunkDesc.GetBlockMetas(); cChunkDef::HeightMap & HeightMap = a_ChunkDesc.GetHeightMap(); - cEntityList & Entities = a_Entities; - cBlockEntityList & BlockEntities = a_BlockEntities; + cEntityList & Entities = a_ChunkDesc.GetEntities(); + cBlockEntityList & BlockEntities = a_ChunkDesc.GetBlockEntities(); if (a_ChunkDesc.IsUsingDefaultBiomes()) { @@ -109,7 +109,7 @@ void cComposableGenerator::DoGenerate(int a_ChunkX, int a_ChunkZ, cChunkDesc & a if (a_ChunkDesc.IsUsingDefaultComposition()) { - m_CompositionGen->ComposeTerrain(a_ChunkX, a_ChunkZ, BlockTypes, BlockMeta, HeightMap, BiomeMap, a_Entities, a_BlockEntities); + m_CompositionGen->ComposeTerrain(a_ChunkX, a_ChunkZ, BlockTypes, BlockMeta, HeightMap, BiomeMap, Entities, BlockEntities); } if (a_ChunkDesc.IsUsingDefaultStructures()) -- cgit v1.2.3