summaryrefslogtreecommitdiffstats
path: root/source/cChunk.cpp
diff options
context:
space:
mode:
authorfaketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-02-20 00:00:00 +0100
committerfaketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-02-20 00:00:00 +0100
commit0b616909e3472a4360e22d6b01749ee44092e967 (patch)
tree6a70857aa2839acd133b77fcc225af6828cb8f39 /source/cChunk.cpp
parentFixed assertion bug in NamedEntitySpawn packet, it used to assert when item ID is 0, but now 0 is allowed (diff)
downloadcuberite-0b616909e3472a4360e22d6b01749ee44092e967.tar
cuberite-0b616909e3472a4360e22d6b01749ee44092e967.tar.gz
cuberite-0b616909e3472a4360e22d6b01749ee44092e967.tar.bz2
cuberite-0b616909e3472a4360e22d6b01749ee44092e967.tar.lz
cuberite-0b616909e3472a4360e22d6b01749ee44092e967.tar.xz
cuberite-0b616909e3472a4360e22d6b01749ee44092e967.tar.zst
cuberite-0b616909e3472a4360e22d6b01749ee44092e967.zip
Diffstat (limited to 'source/cChunk.cpp')
-rw-r--r--source/cChunk.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/cChunk.cpp b/source/cChunk.cpp
index d070e82aa..827e97cb9 100644
--- a/source/cChunk.cpp
+++ b/source/cChunk.cpp
@@ -833,7 +833,7 @@ void cChunk::SetBlock( int a_X, int a_Y, int a_Z, char a_BlockType, char a_Block
return; // Clip
}
- assert(IsValid()); // Is this chunk loaded / generated?
+ ASSERT(IsValid()); // Is this chunk loaded / generated?
int index = a_Y + (a_Z * 128) + (a_X * 128 * 16);
char OldBlockMeta = GetLight( m_BlockMeta, index );
@@ -894,9 +894,9 @@ void cChunk::SetBlock( int a_X, int a_Y, int a_Z, char a_BlockType, char a_Block
void cChunk::FastSetBlock( int a_X, int a_Y, int a_Z, char a_BlockType, char a_BlockMeta)
{
- assert(!((a_X < 0 || a_X >= 16 || a_Y < 0 || a_Y >= 128 || a_Z < 0 || a_Z >= 16)));
+ ASSERT(!((a_X < 0 || a_X >= 16 || a_Y < 0 || a_Y >= 128 || a_Z < 0 || a_Z >= 16)));
- assert(IsValid());
+ ASSERT(IsValid());
const int index = a_Y + (a_Z * 128) + (a_X * 128 * 16);
const char OldBlock = m_BlockType[index];
@@ -1271,7 +1271,7 @@ bool cChunk::LoadFromDisk()
default:
{
- assert(!"Unhandled block entity in file");
+ ASSERT(!"Unhandled block entity in file");
break;
}
}
@@ -1425,7 +1425,7 @@ void cChunk::SaveToJson( Json::Value & a_Value )
default:
{
- assert(!"Unhandled blocktype in BlockEntities list while saving to JSON");
+ ASSERT(!"Unhandled blocktype in BlockEntities list while saving to JSON");
break;
}
} // switch (BlockEntity->GetBlockType())