Fixed minor style issues
This commit is contained in:
parent
8a0d3f7921
commit
cdd3d11496
@ -1 +1 @@
|
|||||||
Subproject commit 013a32a7fb3c8a6cfe0aef892d4c7394d4e1be59
|
Subproject commit 5c8557d4fdfa580c100510cde07a1a778ea2e244
|
@ -1843,7 +1843,7 @@ void cBlockArea::cChunkReader::ChunkBuffer(const cChunkBuffer & a_BlockBuffer)
|
|||||||
int SizeY = m_Area.m_Size.y;
|
int SizeY = m_Area.m_Size.y;
|
||||||
int MinY = m_Origin.y;
|
int MinY = m_Origin.y;
|
||||||
|
|
||||||
// SizeX, SizeZ are the dmensions of the block data to copy from the current chunk (size of the geometric union)
|
// SizeX, SizeZ are the dimensions of the block data to copy from the current chunk (size of the geometric union)
|
||||||
// OffX, OffZ are the offsets of the current chunk data from the area origin
|
// OffX, OffZ are the offsets of the current chunk data from the area origin
|
||||||
// BaseX, BaseZ are the offsets of the area data within the current chunk from the chunk borders
|
// BaseX, BaseZ are the offsets of the area data within the current chunk from the chunk borders
|
||||||
int SizeX = cChunkDef::Width;
|
int SizeX = cChunkDef::Width;
|
||||||
|
@ -317,8 +317,8 @@ protected:
|
|||||||
void CopyNibbles(NIBBLETYPE * a_AreaDst, const NIBBLETYPE * a_ChunkSrc);
|
void CopyNibbles(NIBBLETYPE * a_AreaDst, const NIBBLETYPE * a_ChunkSrc);
|
||||||
|
|
||||||
// cChunkDataCallback overrides:
|
// cChunkDataCallback overrides:
|
||||||
virtual bool Coords (int a_ChunkX, int a_ChunkZ) override;
|
virtual bool Coords(int a_ChunkX, int a_ChunkZ) override;
|
||||||
virtual void ChunkBuffer (const cChunkBuffer & a_BlockTypes) override;
|
virtual void ChunkBuffer(const cChunkBuffer & a_BlockTypes) override;
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
typedef NIBBLETYPE * NIBBLEARRAY;
|
typedef NIBBLETYPE * NIBBLEARRAY;
|
||||||
|
@ -282,10 +282,10 @@ void cChunk::SetAllData(
|
|||||||
CalculateHeightmap(a_BlockTypes);
|
CalculateHeightmap(a_BlockTypes);
|
||||||
}
|
}
|
||||||
|
|
||||||
m_ChunkBuffer.SetBlocks (a_BlockTypes);
|
m_ChunkBuffer.SetBlocks(a_BlockTypes);
|
||||||
m_ChunkBuffer.SetMeta (a_BlockMeta);
|
m_ChunkBuffer.SetMeta(a_BlockMeta);
|
||||||
m_ChunkBuffer.SetLight (a_BlockLight);
|
m_ChunkBuffer.SetLight(a_BlockLight);
|
||||||
m_ChunkBuffer.SetSkyLight (a_BlockSkyLight);
|
m_ChunkBuffer.SetSkyLight(a_BlockSkyLight);
|
||||||
|
|
||||||
m_IsLightValid = (a_BlockLight != NULL) && (a_BlockSkyLight != NULL);
|
m_IsLightValid = (a_BlockLight != NULL) && (a_BlockSkyLight != NULL);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user