Attempt to bring sanity to newlines across systems.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@606 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
@@ -1,52 +1,52 @@
|
||||
|
||||
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
|
||||
|
||||
#include "cPacket_Login.h"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
const std::string cPacket_Login::LEVEL_TYPE_DEFAULT = "DEFAULT";
|
||||
const std::string cPacket_Login::LEVEL_TYPE_SUPERFLAT = "SUPERFLAT";
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
int cPacket_Login::Parse(const char * a_Data, int a_Size)
|
||||
{
|
||||
//printf("Parse: NEW Login\n");
|
||||
int TotalBytes = 0;
|
||||
m_Username.clear();
|
||||
HANDLE_PACKET_READ(ReadInteger, m_ProtocolVersion, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadString16, m_Username, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadString16, m_LevelType, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadInteger, m_ServerMode, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadInteger, m_Dimension, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadByte, m_Difficulty, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadByte, m_WorldHeight, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadByte, m_MaxPlayers, TotalBytes);
|
||||
return TotalBytes;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
void cPacket_Login::Serialize(AString & a_Data) const
|
||||
{
|
||||
AppendByte (a_Data, m_PacketID);
|
||||
AppendInteger (a_Data, m_ProtocolVersion);
|
||||
AppendString16(a_Data, m_Username);
|
||||
AppendString16(a_Data, m_LevelType);
|
||||
AppendInteger (a_Data, m_ServerMode);
|
||||
AppendInteger (a_Data, m_Dimension);
|
||||
AppendByte (a_Data, m_Difficulty);
|
||||
AppendByte (a_Data, m_WorldHeight);
|
||||
AppendByte (a_Data, m_MaxPlayers);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
|
||||
|
||||
#include "cPacket_Login.h"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
const std::string cPacket_Login::LEVEL_TYPE_DEFAULT = "DEFAULT";
|
||||
const std::string cPacket_Login::LEVEL_TYPE_SUPERFLAT = "SUPERFLAT";
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
int cPacket_Login::Parse(const char * a_Data, int a_Size)
|
||||
{
|
||||
//printf("Parse: NEW Login\n");
|
||||
int TotalBytes = 0;
|
||||
m_Username.clear();
|
||||
HANDLE_PACKET_READ(ReadInteger, m_ProtocolVersion, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadString16, m_Username, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadString16, m_LevelType, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadInteger, m_ServerMode, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadInteger, m_Dimension, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadByte, m_Difficulty, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadByte, m_WorldHeight, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadByte, m_MaxPlayers, TotalBytes);
|
||||
return TotalBytes;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
void cPacket_Login::Serialize(AString & a_Data) const
|
||||
{
|
||||
AppendByte (a_Data, m_PacketID);
|
||||
AppendInteger (a_Data, m_ProtocolVersion);
|
||||
AppendString16(a_Data, m_Username);
|
||||
AppendString16(a_Data, m_LevelType);
|
||||
AppendInteger (a_Data, m_ServerMode);
|
||||
AppendInteger (a_Data, m_Dimension);
|
||||
AppendByte (a_Data, m_Difficulty);
|
||||
AppendByte (a_Data, m_WorldHeight);
|
||||
AppendByte (a_Data, m_MaxPlayers);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user