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

ProtoProxy: Fixed weird gcc compilation errors.

Browse Source
This commit is contained in:
madmaxoft 2014-04-14 18:50:44 +02:00
parent 449afa850e
commit 21e5690811
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Tools/ProtoProxy/Connection.cpp
View File

@ -2197,32 +2197,38 @@ bool cConnection::HandleServerSpawnMob(void)
struct sSpawnData
{
AString m_Name;
AString m_Value;
AString m_Signature;
sSpawnData(const AString & a_Name, const AString & a_Value, const AString & a_Signature) :
m_Name(a_Name),
m_Value(a_Value),
m_Signature(a_Signature)
{
}
};
typedef std::vector<sSpawnData> sSpawnDatas;
bool cConnection::HandleServerSpawnNamedEntity(void) bool cConnection::HandleServerSpawnNamedEntity(void)
{ {
HANDLE_SERVER_PACKET_READ(ReadVarInt, UInt32, EntityID); HANDLE_SERVER_PACKET_READ(ReadVarInt, UInt32, EntityID);
HANDLE_SERVER_PACKET_READ(ReadVarUTF8String, AString, EntityUUID); HANDLE_SERVER_PACKET_READ(ReadVarUTF8String, AString, EntityUUID);
HANDLE_SERVER_PACKET_READ(ReadVarUTF8String, AString, EntityName); HANDLE_SERVER_PACKET_READ(ReadVarUTF8String, AString, EntityName);
HANDLE_SERVER_PACKET_READ(ReadVarInt, UInt32, DataCount); HANDLE_SERVER_PACKET_READ(ReadVarInt, UInt32, DataCount);
struct sData sSpawnDatas Data;
{
AString m_Name;
AString m_Value;
AString m_Signature;
sData(const AString & a_Name, const AString & a_Value, const AString & a_Signature) :
m_Name(a_Name),
m_Value(a_Value),
m_Signature(a_Signature)
{
}
};
typedef std::vector<sData> sDataVec;
sDataVec Data;
for (UInt32 i = 0; i < DataCount; i++) for (UInt32 i = 0; i < DataCount; i++)
{ {
HANDLE_SERVER_PACKET_READ(ReadVarUTF8String, AString, Name) HANDLE_SERVER_PACKET_READ(ReadVarUTF8String, AString, Name)
HANDLE_SERVER_PACKET_READ(ReadVarUTF8String, AString, Value) HANDLE_SERVER_PACKET_READ(ReadVarUTF8String, AString, Value)
HANDLE_SERVER_PACKET_READ(ReadVarUTF8String, AString, Signature) HANDLE_SERVER_PACKET_READ(ReadVarUTF8String, AString, Signature)
Data.push_back(sData(Name, Value, Signature)); Data.push_back(sSpawnData(Name, Value, Signature));
} }
HANDLE_SERVER_PACKET_READ(ReadBEInt, int, PosX); HANDLE_SERVER_PACKET_READ(ReadBEInt, int, PosX);
HANDLE_SERVER_PACKET_READ(ReadBEInt, int, PosY); HANDLE_SERVER_PACKET_READ(ReadBEInt, int, PosY);
@ -2242,7 +2248,7 @@ bool cConnection::HandleServerSpawnNamedEntity(void)
Log(" UUID = \"%s\"", EntityUUID.c_str()); Log(" UUID = \"%s\"", EntityUUID.c_str());
Log(" Name = \"%s\"", EntityName.c_str()); Log(" Name = \"%s\"", EntityName.c_str());
Log(" NumData = %u", DataCount); Log(" NumData = %u", DataCount);
for (sDataVec::const_iterator itr = Data.begin(), end = Data.end(); itr != end; ++itr) for (sSpawnDatas::const_iterator itr = Data.begin(), end = Data.end(); itr != end; ++itr)
{ {
Log(" Name = \"%s\", Value = \"%s\", Signature = \"%s\"", Log(" Name = \"%s\", Value = \"%s\", Signature = \"%s\"",
itr->m_Name.c_str(), itr->m_Value.c_str(), itr->m_Signature.c_str() itr->m_Name.c_str(), itr->m_Value.c_str(), itr->m_Signature.c_str()