diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-08-25 19:52:08 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-08-25 19:52:08 +0200 |
| commit | bb25ba4977198728b6ee30b61fcc6f48d1d94d4d (patch) | |
| tree | cd56d34bafc04ba7b2f7d2e0e5634eda540c246e /source/packets/cPacket_MultiBlock.cpp | |
| parent | Removed packet includes where they're not needed (diff) | |
| download | cuberite-bb25ba4977198728b6ee30b61fcc6f48d1d94d4d.tar cuberite-bb25ba4977198728b6ee30b61fcc6f48d1d94d4d.tar.gz cuberite-bb25ba4977198728b6ee30b61fcc6f48d1d94d4d.tar.bz2 cuberite-bb25ba4977198728b6ee30b61fcc6f48d1d94d4d.tar.lz cuberite-bb25ba4977198728b6ee30b61fcc6f48d1d94d4d.tar.xz cuberite-bb25ba4977198728b6ee30b61fcc6f48d1d94d4d.tar.zst cuberite-bb25ba4977198728b6ee30b61fcc6f48d1d94d4d.zip | |
Diffstat (limited to '')
| -rw-r--r-- | source/packets/cPacket_MultiBlock.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/source/packets/cPacket_MultiBlock.cpp b/source/packets/cPacket_MultiBlock.cpp index 9ae175508..68daf2700 100644 --- a/source/packets/cPacket_MultiBlock.cpp +++ b/source/packets/cPacket_MultiBlock.cpp @@ -7,15 +7,14 @@ -cPacket_MultiBlock::cPacket_MultiBlock( const cPacket_MultiBlock & a_Copy ) +cPacket_MultiBlock::cPacket_MultiBlock(const cPacket_MultiBlock & a_Copy) { - m_PacketID = E_MULTI_BLOCK; - m_ChunkX = a_Copy.m_ChunkX; - m_ChunkZ = a_Copy.m_ChunkZ; + m_PacketID = E_MULTI_BLOCK; + m_ChunkX = a_Copy.m_ChunkX; + m_ChunkZ = a_Copy.m_ChunkZ; m_NumBlocks = a_Copy.m_NumBlocks; - m_DataSize = a_Copy.m_DataSize; - m_Data = new sBlockChange[m_NumBlocks]; - memcpy( m_Data, a_Copy.m_Data, sizeof(sBlockChange)*m_NumBlocks ); + m_Data = new sBlockChange[m_NumBlocks]; + memcpy(m_Data, a_Copy.m_Data, sizeof(sBlockChange) * m_NumBlocks); } @@ -24,7 +23,7 @@ cPacket_MultiBlock::cPacket_MultiBlock( const cPacket_MultiBlock & a_Copy ) cPacket_MultiBlock::~cPacket_MultiBlock() { - delete [] m_Data; + delete[] m_Data; } @@ -38,8 +37,8 @@ void cPacket_MultiBlock::Serialize(AString & a_Data) const AppendInteger(a_Data, m_ChunkZ); AppendShort (a_Data, m_NumBlocks); - AppendInteger(a_Data, m_DataSize); - for( int i = 0; i < m_NumBlocks; ++i ) + AppendInteger(a_Data, sizeof(*m_Data) * m_NumBlocks); + for (short i = 0; i < m_NumBlocks; ++i) { AppendInteger(a_Data, m_Data[i].Data); } |