1
0

Fixed Linux compilation, slight code cleanup

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1396 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com
2013-04-19 08:21:39 +00:00
parent 0ceadbe7e0
commit 9b9a37e507
9 changed files with 47 additions and 46 deletions

View File

@@ -352,7 +352,7 @@ void cProtocol125::SendEntityStatus(const cEntity & a_Entity, char a_Status)
void cProtocol125::SendExplosion(double a_BlockX, double a_BlockY, double a_BlockZ, float a_Radius, cVector3iList a_BlocksAffected, float a_PlayerMotionX, float a_PlayerMotionY, float a_PlayerMotionZ)
void cProtocol125::SendExplosion(double a_BlockX, double a_BlockY, double a_BlockZ, float a_Radius, cVector3iArray a_BlocksAffected, const Vector3d & a_PlayerMotion)
{
cCSLock Lock(m_CSPacket);
WriteByte(PACKET_EXPLOSION);
@@ -360,19 +360,16 @@ void cProtocol125::SendExplosion(double a_BlockX, double a_BlockY, double a_Bloc
WriteDouble (a_BlockY);
WriteDouble (a_BlockZ);
WriteFloat (a_Radius);
WriteInt (a_BlocksAffected.size());//it should be a_RecordCount
/*WriteByte (0); //It should be the record
WriteByte (0);
WriteByte (0);*/
for (cVector3iList::iterator itr = a_BlocksAffected.begin(); itr != a_BlocksAffected.end(); ++itr)
WriteInt (a_BlocksAffected.size());
for (cVector3iArray::const_iterator itr = a_BlocksAffected.begin(); itr != a_BlocksAffected.end(); ++itr)
{
WriteByte ((Byte)((*itr)->x - a_BlockX));
WriteByte ((Byte)((*itr)->y - a_BlockY));
WriteByte ((Byte)((*itr)->z - a_BlockZ));
WriteByte ((Byte)(itr->x - a_BlockX));
WriteByte ((Byte)(itr->y - a_BlockY));
WriteByte ((Byte)(itr->z - a_BlockZ));
}
WriteFloat (a_PlayerMotionX);
WriteFloat (a_PlayerMotionY);
WriteFloat (a_PlayerMotionZ);
WriteFloat ((float)a_PlayerMotion.x);
WriteFloat ((float)a_PlayerMotion.y);
WriteFloat ((float)a_PlayerMotion.z);
Flush();
}