flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Using own ASSERT() that logs to file

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@297 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
faketruth
2012-02-19 23:00:00 +00:00
parent df39f12e30
commit 0b616909e3
22 changed files with 50 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/cClientHandle.cpp
View File

@@ -315,7 +315,7 @@ void cClientHandle::StreamChunks(void)
return;
}
assert(m_Player != NULL);
ASSERT(m_Player != NULL);
int ChunkPosX = FAST_FLOOR_DIV(m_Player->GetPosX(), 16);
int ChunkPosZ = FAST_FLOOR_DIV(m_Player->GetPosZ(), 16);
@@ -331,7 +331,7 @@ void cClientHandle::StreamChunks(void)
LOGINFO("Streaming chunks centered on [%d, %d]", ChunkPosX, ChunkPosZ);
cWorld * World = m_Player->GetWorld();
assert(World != NULL);
ASSERT(World != NULL);
// Remove all loaded chunks that are no longer in range:
{
@@ -405,7 +405,7 @@ void cClientHandle::StreamChunks(void)
void cClientHandle::StreamChunk(int a_ChunkX, int a_ChunkY, int a_ChunkZ)
{
cWorld * World = m_Player->GetWorld();
assert(World != NULL);
ASSERT(World != NULL);
cChunkPtr Chunk = World->GetChunk(a_ChunkX, 0, a_ChunkZ);
if (!Chunk->HasClient(this))
@@ -1829,7 +1829,7 @@ void cClientHandle::SendThread(void *lpParam)
if (NrmSendPackets.size() == 0 && LowSendPackets.size() == 0)
{
assert(!self->m_bKeepThreadGoing);
ASSERT(!self->m_bKeepThreadGoing);
if (self->m_bKeepThreadGoing)
{
LOGERROR("ERROR: Semaphore was signaled while no packets to send");
@@ -1939,7 +1939,7 @@ void cClientHandle::DataReceived(const char * a_Data, int a_Size)
// Packet parsed successfully, add it to internal queue:
HandlePacket(pPacket);
// Erase the packet from the buffer:
assert(m_ReceivedData.size() > (size_t)NumBytes);
ASSERT(m_ReceivedData.size() > (size_t)NumBytes);
m_ReceivedData.erase(0, NumBytes + 1);
}
} // while (!Received.empty())