diff options
author | Tycho <work.tycho+git@gmail.com> | 2014-05-21 20:58:48 +0200 |
---|---|---|
committer | Tycho <work.tycho+git@gmail.com> | 2014-05-21 20:58:48 +0200 |
commit | 024027db89ca833406147b79b7be74fc92906bbe (patch) | |
tree | 844345e33c2a9c8fb7f5ca255f0bd1236a41b446 /src/ChunkData.h | |
parent | Fixed minor style issues (diff) | |
download | cuberite-024027db89ca833406147b79b7be74fc92906bbe.tar cuberite-024027db89ca833406147b79b7be74fc92906bbe.tar.gz cuberite-024027db89ca833406147b79b7be74fc92906bbe.tar.bz2 cuberite-024027db89ca833406147b79b7be74fc92906bbe.tar.lz cuberite-024027db89ca833406147b79b7be74fc92906bbe.tar.xz cuberite-024027db89ca833406147b79b7be74fc92906bbe.tar.zst cuberite-024027db89ca833406147b79b7be74fc92906bbe.zip |
Diffstat (limited to '')
-rw-r--r-- | src/ChunkData.h (renamed from src/ChunkBuffer.h) | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/ChunkBuffer.h b/src/ChunkData.h index 266df2332..809f3cdf2 100644 --- a/src/ChunkBuffer.h +++ b/src/ChunkData.h @@ -17,11 +17,11 @@ // unique_ptr style interface for memory management #endif -class cChunkBuffer +class cChunkData { public: - cChunkBuffer() + cChunkData() #if __cplusplus < 201103L // auto_ptr style interface for memory management : IsOwner(true) @@ -29,7 +29,7 @@ public: { memset(m_Sections, 0, sizeof(m_Sections)); } - ~cChunkBuffer() + ~cChunkData() { #if __cplusplus < 201103L // auto_ptr style interface for memory management @@ -43,7 +43,7 @@ public: #if __cplusplus < 201103L // auto_ptr style interface for memory management - cChunkBuffer(const cChunkBuffer& other) : + cChunkData(const cChunkData& other) : IsOwner(true) { for (int i = 0; i < CHUNK_SECTION_NUM; i++) @@ -53,7 +53,7 @@ public: other.IsOwner = false; } - cChunkBuffer& operator=(const cChunkBuffer& other) + cChunkData& operator=(const cChunkData& other) { if(&other != this) { @@ -76,7 +76,7 @@ public: } #else // unique_ptr style interface for memory management - cChunkBuffer(cChunkBuffer&& other) + cChunkData(cChunkData&& other) { for (int i = 0; i < CHUNK_SECTION_NUM; i++) { @@ -85,7 +85,7 @@ public: } } - cChunkBuffer& operator=(cChunkBuffer&& other) + cChunkData& operator=(cChunkData&& other) { if(&other != this) { @@ -125,7 +125,7 @@ public: (a_RelZ >= cChunkDef::Width) || (a_RelZ < 0) ) { - ASSERT(!"cChunkBuffer::SetMeta(): index out of range!"); + ASSERT(!"cChunkData::SetMeta(): index out of range!"); return; } @@ -163,7 +163,7 @@ public: return 0; } } - ASSERT(!"cChunkBuffer::GetMeta(): coords out of chunk range!"); + ASSERT(!"cChunkData::GetMeta(): coords out of chunk range!"); return 0; } @@ -175,7 +175,7 @@ public: (a_RelZ >= cChunkDef::Width) || (a_RelZ < 0) ) { - ASSERT(!"cChunkBuffer::SetMeta(): index out of range!"); + ASSERT(!"cChunkData::SetMeta(): index out of range!"); return; } @@ -216,7 +216,7 @@ public: return 0; } } - ASSERT(!"cChunkBuffer::GetMeta(): coords out of chunk range!"); + ASSERT(!"cChunkData::GetMeta(): coords out of chunk range!"); return 0; } @@ -235,11 +235,11 @@ public: return 0xF; } } - ASSERT(!"cChunkBuffer::GetMeta(): coords out of chunk range!"); + ASSERT(!"cChunkData::GetMeta(): coords out of chunk range!"); return 0; } - cChunkBuffer Copy() const; + cChunkData Copy() const; void CopyBlocks (BLOCKTYPE * a_dest, size_t a_Idx = 0, size_t length = cChunkDef::NumBlocks) const; void CopyMeta (NIBBLETYPE * a_dest) const; void CopyLight (NIBBLETYPE * a_dest) const; |