diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-05-21 19:33:54 +0200 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-05-21 19:33:54 +0200 |
| commit | cdd3d11496d51ce6f444a2e637fee1d38e07fd09 (patch) | |
| tree | 74e22a66fb6cfedda6bddd43d68c1129532e239f | |
| parent | Fixed issue with types not being defined for an unused parameter (diff) | |
| download | cuberite-cdd3d11496d51ce6f444a2e637fee1d38e07fd09.tar cuberite-cdd3d11496d51ce6f444a2e637fee1d38e07fd09.tar.gz cuberite-cdd3d11496d51ce6f444a2e637fee1d38e07fd09.tar.bz2 cuberite-cdd3d11496d51ce6f444a2e637fee1d38e07fd09.tar.lz cuberite-cdd3d11496d51ce6f444a2e637fee1d38e07fd09.tar.xz cuberite-cdd3d11496d51ce6f444a2e637fee1d38e07fd09.tar.zst cuberite-cdd3d11496d51ce6f444a2e637fee1d38e07fd09.zip | |
| m--------- | MCServer/Plugins/Core | 0 | ||||
| -rw-r--r-- | src/BlockArea.cpp | 2 | ||||
| -rw-r--r-- | src/BlockArea.h | 4 | ||||
| -rw-r--r-- | src/Chunk.cpp | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core -Subproject 013a32a7fb3c8a6cfe0aef892d4c7394d4e1be5 +Subproject 5c8557d4fdfa580c100510cde07a1a778ea2e24 diff --git a/src/BlockArea.cpp b/src/BlockArea.cpp index fd2f3c9b4..5e41b135c 100644 --- a/src/BlockArea.cpp +++ b/src/BlockArea.cpp @@ -1843,7 +1843,7 @@ void cBlockArea::cChunkReader::ChunkBuffer(const cChunkBuffer & a_BlockBuffer) int SizeY = m_Area.m_Size.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 // BaseX, BaseZ are the offsets of the area data within the current chunk from the chunk borders int SizeX = cChunkDef::Width; diff --git a/src/BlockArea.h b/src/BlockArea.h index 9c01719c3..6b3bdf337 100644 --- a/src/BlockArea.h +++ b/src/BlockArea.h @@ -317,8 +317,8 @@ protected: void CopyNibbles(NIBBLETYPE * a_AreaDst, const NIBBLETYPE * a_ChunkSrc); // cChunkDataCallback overrides: - virtual bool Coords (int a_ChunkX, int a_ChunkZ) override; - virtual void ChunkBuffer (const cChunkBuffer & a_BlockTypes) override; + virtual bool Coords(int a_ChunkX, int a_ChunkZ) override; + virtual void ChunkBuffer(const cChunkBuffer & a_BlockTypes) override; } ; typedef NIBBLETYPE * NIBBLEARRAY; diff --git a/src/Chunk.cpp b/src/Chunk.cpp index a986ac076..00ea33e16 100644 --- a/src/Chunk.cpp +++ b/src/Chunk.cpp @@ -282,10 +282,10 @@ void cChunk::SetAllData( CalculateHeightmap(a_BlockTypes); } - m_ChunkBuffer.SetBlocks (a_BlockTypes); - m_ChunkBuffer.SetMeta (a_BlockMeta); - m_ChunkBuffer.SetLight (a_BlockLight); - m_ChunkBuffer.SetSkyLight (a_BlockSkyLight); + m_ChunkBuffer.SetBlocks(a_BlockTypes); + m_ChunkBuffer.SetMeta(a_BlockMeta); + m_ChunkBuffer.SetLight(a_BlockLight); + m_ChunkBuffer.SetSkyLight(a_BlockSkyLight); m_IsLightValid = (a_BlockLight != NULL) && (a_BlockSkyLight != NULL); |