diff options
| author | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-02-20 00:00:00 +0100 |
|---|---|---|
| committer | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-02-20 00:00:00 +0100 |
| commit | 0b616909e3472a4360e22d6b01749ee44092e967 (patch) | |
| tree | 6a70857aa2839acd133b77fcc225af6828cb8f39 /source/packets | |
| parent | Fixed assertion bug in NamedEntitySpawn packet, it used to assert when item ID is 0, but now 0 is allowed (diff) | |
| download | cuberite-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/packets')
| -rw-r--r-- | source/packets/cPacket.h | 4 | ||||
| -rw-r--r-- | source/packets/cPacket_CreativeInventoryAction.cpp | 2 | ||||
| -rw-r--r-- | source/packets/cPacket_MapChunk.cpp | 2 | ||||
| -rw-r--r-- | source/packets/cPacket_NamedEntitySpawn.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/source/packets/cPacket.h b/source/packets/cPacket.h index fbdde5ac3..7eb224c9e 100644 --- a/source/packets/cPacket.h +++ b/source/packets/cPacket.h @@ -42,7 +42,7 @@ public: virtual int Parse(const char * a_Data, int a_Size)
{
LOGERROR("Undefined Parse function for packet type 0x%x\n", m_PacketID );
- assert(!"Undefined Parse function");
+ ASSERT(!"Undefined Parse function");
return -1;
}
@@ -50,7 +50,7 @@ public: virtual void Serialize(AString & a_Data) const
{
LOGERROR("Undefined Serialize function for packet type 0x%x\n", m_PacketID );
- assert(!"Undefined Serialize function");
+ ASSERT(!"Undefined Serialize function");
}
virtual cPacket * Clone() const = 0;
diff --git a/source/packets/cPacket_CreativeInventoryAction.cpp b/source/packets/cPacket_CreativeInventoryAction.cpp index 14d544877..af500e503 100644 --- a/source/packets/cPacket_CreativeInventoryAction.cpp +++ b/source/packets/cPacket_CreativeInventoryAction.cpp @@ -48,7 +48,7 @@ int cPacket_CreativeInventoryAction::Parse(const char * a_Data, int a_Size) void cPacket_CreativeInventoryAction::Serialize(AString & a_Data) const
{
short ItemID = m_ItemID;
- assert(ItemID >= -1); // Check validity of packets in debug runtime
+ ASSERT(ItemID >= -1); // Check validity of packets in debug runtime
if (ItemID <= 0)
{
ItemID = -1;
diff --git a/source/packets/cPacket_MapChunk.cpp b/source/packets/cPacket_MapChunk.cpp index 522842d32..54ebc6be5 100644 --- a/source/packets/cPacket_MapChunk.cpp +++ b/source/packets/cPacket_MapChunk.cpp @@ -21,7 +21,7 @@ cPacket_MapChunk::~cPacket_MapChunk() cPacket_MapChunk::cPacket_MapChunk(cChunk * a_Chunk)
{
- assert(a_Chunk->IsValid());
+ ASSERT(a_Chunk->IsValid());
m_PacketID = E_MAP_CHUNK;
m_PosX = a_Chunk->GetPosX() * 16; // It has to be block coordinates
diff --git a/source/packets/cPacket_NamedEntitySpawn.cpp b/source/packets/cPacket_NamedEntitySpawn.cpp index 19d12e4bd..8b4b912d8 100644 --- a/source/packets/cPacket_NamedEntitySpawn.cpp +++ b/source/packets/cPacket_NamedEntitySpawn.cpp @@ -10,7 +10,7 @@ void cPacket_NamedEntitySpawn::Serialize(AString & a_Data) const
{
short CurrentItem = m_CurrentItem;
- assert(CurrentItem >= 0);
+ ASSERT(CurrentItem >= 0);
if (CurrentItem <= 0)
{
CurrentItem = 0;
|