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

Removed the split between 1.2.3 and 1.1, left only 1.2.3 code

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@429 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com
2012-03-24 11:40:29 +00:00
parent b69ac328c0
commit e1ef489e08
13 changed files with 11 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/packets/cPacket_MultiBlock.h
View File

@@ -24,15 +24,10 @@ public:
: m_ChunkX( 0 )
, m_ChunkZ( 0 )
, m_NumBlocks( 0 )
#if (MINECRAFT_1_2_2 == 1)
, m_DataSize( 0 )
, m_Data( 0 )
#else
, m_BlockCoordinates( 0 )
, m_BlockTypes( 0 )
, m_BlockMetas( 0 )
#endif
, m_Data( NULL )
{ m_PacketID = E_MULTI_BLOCK; }
cPacket_MultiBlock( const cPacket_MultiBlock & a_Copy );
~cPacket_MultiBlock();
virtual cPacket* Clone() const { return new cPacket_MultiBlock(*this); }
@@ -43,17 +38,8 @@ public:
int m_ChunkZ;
short m_NumBlocks;
#if (MINECRAFT_1_2_2 == 1)
int m_DataSize; // Should be 4*m_NumBlocks ??
sBlockChange* m_Data;
static const unsigned int cSize = 1 + 4 + 4 + 2 + 4; // Minimum size (when NumBlocks == 0)
#else
static const unsigned int c_Size = 1 + 4 + 4 + 2; // Minimum size (when NumBlocks == 0)
unsigned short* m_BlockCoordinates; // x<<12 | z<<8 | y
char* m_BlockTypes;
char* m_BlockMetas;
#endif
int m_DataSize; // Should be 4 * m_NumBlocks ??
sBlockChange * m_Data;
};