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

More Clang warning fixes in the protocols.

Browse Source
This commit is contained in:
madmaxoft 2014-04-04 11:47:46 +02:00
parent 3590f97e00
commit 4be894f060
6 changed files with 82 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Protocol/ChunkDataSerializer.cpp
View File

@ -105,7 +105,7 @@ void cChunkDataSerializer::Serialize29(AString & a_Data)
a_Data.append((const char *)&BitMap1, sizeof(short)); a_Data.append((const char *)&BitMap1, sizeof(short));
a_Data.append((const char *)&BitMap2, sizeof(short)); a_Data.append((const char *)&BitMap2, sizeof(short));
Int32 CompressedSizeBE = htonl(CompressedSize); UInt32 CompressedSizeBE = htonl((UInt32)CompressedSize);
a_Data.append((const char *)&CompressedSizeBE, sizeof(CompressedSizeBE)); a_Data.append((const char *)&CompressedSizeBE, sizeof(CompressedSizeBE));
Int32 UnusedInt32 = 0; Int32 UnusedInt32 = 0;
@ -163,7 +163,7 @@ void cChunkDataSerializer::Serialize39(AString & a_Data)
a_Data.append((const char *)&BitMap1, sizeof(short)); a_Data.append((const char *)&BitMap1, sizeof(short));
a_Data.append((const char *)&BitMap2, sizeof(short)); a_Data.append((const char *)&BitMap2, sizeof(short));
Int32 CompressedSizeBE = htonl(CompressedSize); UInt32 CompressedSizeBE = htonl((UInt32)CompressedSize);
a_Data.append((const char *)&CompressedSizeBE, sizeof(CompressedSizeBE)); a_Data.append((const char *)&CompressedSizeBE, sizeof(CompressedSizeBE));
// Unlike 29, 39 doesn't have the "unused" int // Unlike 29, 39 doesn't have the "unused" int

139
src/Protocol/Protocol125.cpp
View File

@ -161,8 +161,8 @@ void cProtocol125::SendBlockAction(int a_BlockX, int a_BlockY, int a_BlockZ, cha
WriteInt (a_BlockX); WriteInt (a_BlockX);
WriteShort((short)a_BlockY); WriteShort((short)a_BlockY);
WriteInt (a_BlockZ); WriteInt (a_BlockZ);
WriteByte (a_Byte1); WriteChar (a_Byte1);
WriteByte (a_Byte2); WriteChar (a_Byte2);
Flush(); Flush();
} }
@ -209,12 +209,12 @@ void cProtocol125::SendBlockChanges(int a_ChunkX, int a_ChunkZ, const sSetBlockV
WriteByte (PACKET_MULTI_BLOCK); WriteByte (PACKET_MULTI_BLOCK);
WriteInt (a_ChunkX); WriteInt (a_ChunkX);
WriteInt (a_ChunkZ); WriteInt (a_ChunkZ);
WriteShort((unsigned short)a_Changes.size()); WriteShort((short)a_Changes.size());
WriteUInt (sizeof(int) * a_Changes.size()); WriteUInt ((UInt32)(sizeof(int) * a_Changes.size()));
for (sSetBlockVector::const_iterator itr = a_Changes.begin(), end = a_Changes.end(); itr != end; ++itr) for (sSetBlockVector::const_iterator itr = a_Changes.begin(), end = a_Changes.end(); itr != end; ++itr)
{ {
unsigned int Coords = itr->y | (itr->z << 8) | (itr->x << 12); UInt32 Coords = ((UInt32)itr->y) | ((UInt32)(itr->z << 8)) | ((UInt32)(itr->x << 12));
unsigned int Blocks = itr->BlockMeta | (itr->BlockType << 4); UInt32 Blocks = ((UInt32)itr->BlockMeta) | ((UInt32)(itr->BlockType << 4));
WriteUInt(Coords << 16 | Blocks); WriteUInt(Coords << 16 | Blocks);
} }
Flush(); Flush();
@ -325,8 +325,8 @@ void cProtocol125::SendEntityEffect(const cEntity & a_Entity, int a_EffectID, in
cCSLock Lock(m_CSPacket); cCSLock Lock(m_CSPacket);
WriteByte (PACKET_ENTITY_EFFECT); WriteByte (PACKET_ENTITY_EFFECT);
WriteInt (a_Entity.GetUniqueID()); WriteInt (a_Entity.GetUniqueID());
WriteByte (a_EffectID); WriteByte ((Byte)a_EffectID);
WriteByte (a_Amplifier); WriteByte ((Byte)a_Amplifier);
WriteShort(a_Duration); WriteShort(a_Duration);
Flush(); Flush();
} }
@ -357,7 +357,7 @@ void cProtocol125::SendEntityHeadLook(const cEntity & a_Entity)
cCSLock Lock(m_CSPacket); cCSLock Lock(m_CSPacket);
WriteByte(PACKET_ENT_HEAD_LOOK); WriteByte(PACKET_ENT_HEAD_LOOK);
WriteInt (a_Entity.GetUniqueID()); WriteInt (a_Entity.GetUniqueID());
WriteByte((char)((a_Entity.GetHeadYaw() / 360.f) * 256)); WriteChar((char)((a_Entity.GetHeadYaw() / 360.f) * 256));
Flush(); Flush();
} }
@ -372,8 +372,8 @@ void cProtocol125::SendEntityLook(const cEntity & a_Entity)
cCSLock Lock(m_CSPacket); cCSLock Lock(m_CSPacket);
WriteByte(PACKET_ENT_LOOK); WriteByte(PACKET_ENT_LOOK);
WriteInt (a_Entity.GetUniqueID()); WriteInt (a_Entity.GetUniqueID());
WriteByte((char)((a_Entity.GetYaw() / 360.f) * 256)); WriteChar((char)((a_Entity.GetYaw() / 360.f) * 256));
WriteByte((char)((a_Entity.GetPitch() / 360.f) * 256)); WriteChar((char)((a_Entity.GetPitch() / 360.f) * 256));
Flush(); Flush();
} }
@ -421,9 +421,9 @@ void cProtocol125::SendEntityRelMove(const cEntity & a_Entity, char a_RelX, char
cCSLock Lock(m_CSPacket); cCSLock Lock(m_CSPacket);
WriteByte(PACKET_ENT_REL_MOVE); WriteByte(PACKET_ENT_REL_MOVE);
WriteInt (a_Entity.GetUniqueID()); WriteInt (a_Entity.GetUniqueID());
WriteByte(a_RelX); WriteChar(a_RelX);
WriteByte(a_RelY); WriteChar(a_RelY);
WriteByte(a_RelZ); WriteChar(a_RelZ);
Flush(); Flush();
} }
@ -438,11 +438,11 @@ void cProtocol125::SendEntityRelMoveLook(const cEntity & a_Entity, char a_RelX,
cCSLock Lock(m_CSPacket); cCSLock Lock(m_CSPacket);
WriteByte(PACKET_ENT_REL_MOVE_LOOK); WriteByte(PACKET_ENT_REL_MOVE_LOOK);
WriteInt (a_Entity.GetUniqueID()); WriteInt (a_Entity.GetUniqueID());
WriteByte(a_RelX); WriteChar(a_RelX);
WriteByte(a_RelY); WriteChar(a_RelY);
WriteByte(a_RelZ); WriteChar(a_RelZ);
WriteByte((char)((a_Entity.GetYaw() / 360.f) * 256)); WriteChar((char)((a_Entity.GetYaw() / 360.f) * 256));
WriteByte((char)((a_Entity.GetPitch() / 360.f) * 256)); WriteChar((char)((a_Entity.GetPitch() / 360.f) * 256));
Flush(); Flush();
} }
@ -455,7 +455,7 @@ void cProtocol125::SendEntityStatus(const cEntity & a_Entity, char a_Status)
cCSLock Lock(m_CSPacket); cCSLock Lock(m_CSPacket);
WriteByte(PACKET_ENT_STATUS); WriteByte(PACKET_ENT_STATUS);
WriteInt (a_Entity.GetUniqueID()); WriteInt (a_Entity.GetUniqueID());
WriteByte(a_Status); WriteChar(a_Status);
Flush(); Flush();
} }
@ -488,7 +488,7 @@ void cProtocol125::SendExplosion(double a_BlockX, double a_BlockY, double a_Bloc
WriteDouble (a_BlockY); WriteDouble (a_BlockY);
WriteDouble (a_BlockZ); WriteDouble (a_BlockZ);
WriteFloat (a_Radius); WriteFloat (a_Radius);
WriteInt (a_BlocksAffected.size()); WriteInt ((Int32)a_BlocksAffected.size());
int BlockX = (int)a_BlockX; int BlockX = (int)a_BlockX;
int BlockY = (int)a_BlockY; int BlockY = (int)a_BlockY;
int BlockZ = (int)a_BlockZ; int BlockZ = (int)a_BlockZ;
@ -513,7 +513,7 @@ void cProtocol125::SendGameMode(eGameMode a_GameMode)
cCSLock Lock(m_CSPacket); cCSLock Lock(m_CSPacket);
WriteByte(PACKET_CHANGE_GAME_STATE); WriteByte(PACKET_CHANGE_GAME_STATE);
WriteByte(3); WriteByte(3);
WriteByte((char)a_GameMode); WriteChar((char)a_GameMode);
Flush(); Flush();
} }
@ -538,7 +538,7 @@ void cProtocol125::SendHealth(void)
cCSLock Lock(m_CSPacket); cCSLock Lock(m_CSPacket);
WriteByte (PACKET_UPDATE_HEALTH); WriteByte (PACKET_UPDATE_HEALTH);
WriteShort((short)m_Client->GetPlayer()->GetHealth()); WriteShort((short)m_Client->GetPlayer()->GetHealth());
WriteShort(m_Client->GetPlayer()->GetFoodLevel()); WriteShort((short)m_Client->GetPlayer()->GetFoodLevel());
WriteFloat((float)m_Client->GetPlayer()->GetFoodSaturationLevel()); WriteFloat((float)m_Client->GetPlayer()->GetFoodSaturationLevel());
Flush(); Flush();
} }
@ -551,7 +551,7 @@ void cProtocol125::SendInventorySlot(char a_WindowID, short a_SlotNum, const cIt
{ {
cCSLock Lock(m_CSPacket); cCSLock Lock(m_CSPacket);
WriteByte (PACKET_INVENTORY_SLOT); WriteByte (PACKET_INVENTORY_SLOT);
WriteByte (a_WindowID); WriteChar (a_WindowID);
WriteShort(a_SlotNum); WriteShort(a_SlotNum);
WriteItem (a_Item); WriteItem (a_Item);
Flush(); Flush();
@ -600,17 +600,14 @@ void cProtocol125::SendMapColumn(int a_ID, int a_X, int a_Y, const Byte * a_Colo
WriteByte (PACKET_ITEM_DATA); WriteByte (PACKET_ITEM_DATA);
WriteShort(E_ITEM_MAP); WriteShort(E_ITEM_MAP);
WriteShort(a_ID); WriteShort((short)a_ID);
WriteShort(3 + a_Length); WriteShort((short)(3 + a_Length));
WriteByte(0); WriteByte(0);
WriteByte(a_X); WriteChar((char)a_X);
WriteByte(a_Y); WriteChar((char)a_Y);
for (unsigned int i = 0; i < a_Length; ++i) SendData((const char *)a_Colors, a_Length);
{
WriteByte(a_Colors[i]);
}
Flush(); Flush();
} }
@ -625,16 +622,16 @@ void cProtocol125::SendMapDecorators(int a_ID, const cMapDecoratorList & a_Decor
WriteByte (PACKET_ITEM_DATA); WriteByte (PACKET_ITEM_DATA);
WriteShort(E_ITEM_MAP); WriteShort(E_ITEM_MAP);
WriteShort(a_ID); WriteShort((short)a_ID);
WriteShort(1 + (3 * a_Decorators.size())); WriteShort((short)(1 + (3 * a_Decorators.size())));
WriteByte(1); WriteByte(1);
for (cMapDecoratorList::const_iterator it = a_Decorators.begin(); it != a_Decorators.end(); ++it) for (cMapDecoratorList::const_iterator it = a_Decorators.begin(); it != a_Decorators.end(); ++it)
{ {
WriteByte((it->GetType() << 4) | (it->GetRot() & 0xf)); WriteByte((Byte)(it->GetType() << 4) | (it->GetRot() & 0xf));
WriteByte(it->GetPixelX()); WriteByte((Byte)it->GetPixelX());
WriteByte(it->GetPixelZ()); WriteByte((Byte)it->GetPixelZ());
} }
Flush(); Flush();
@ -651,7 +648,7 @@ void cProtocol125::SendPickupSpawn(const cPickup & a_Pickup)
WriteByte (PACKET_PICKUP_SPAWN); WriteByte (PACKET_PICKUP_SPAWN);
WriteInt (a_Pickup.GetUniqueID()); WriteInt (a_Pickup.GetUniqueID());
WriteShort (a_Pickup.GetItem().m_ItemType); WriteShort (a_Pickup.GetItem().m_ItemType);
WriteByte (a_Pickup.GetItem().m_ItemCount); WriteChar (a_Pickup.GetItem().m_ItemCount);
WriteShort (a_Pickup.GetItem().m_ItemDamage); WriteShort (a_Pickup.GetItem().m_ItemDamage);
WriteVectorI((Vector3i)(a_Pickup.GetPosition() * 32)); WriteVectorI((Vector3i)(a_Pickup.GetPosition() * 32));
WriteByte ((char)(a_Pickup.GetSpeed().x * 8)); WriteByte ((char)(a_Pickup.GetSpeed().x * 8));
@ -669,7 +666,7 @@ void cProtocol125::SendEntityAnimation(const cEntity & a_Entity, char a_Animatio
cCSLock Lock(m_CSPacket); cCSLock Lock(m_CSPacket);
WriteByte(PACKET_ANIMATION); WriteByte(PACKET_ANIMATION);
WriteInt (a_Entity.GetUniqueID()); WriteInt (a_Entity.GetUniqueID());
WriteByte(a_Animation); WriteChar(a_Animation);
Flush(); Flush();
} }
@ -763,8 +760,8 @@ void cProtocol125::SendPlayerSpawn(const cPlayer & a_Player)
WriteInt ((int)(a_Player.GetPosX() * 32)); WriteInt ((int)(a_Player.GetPosX() * 32));
WriteInt ((int)(a_Player.GetPosY() * 32)); WriteInt ((int)(a_Player.GetPosY() * 32));
WriteInt ((int)(a_Player.GetPosZ() * 32)); WriteInt ((int)(a_Player.GetPosZ() * 32));
WriteByte ((char)((a_Player.GetYaw() / 360.f) * 256)); WriteChar ((char)((a_Player.GetYaw() / 360.f) * 256));
WriteByte ((char)((a_Player.GetPitch() / 360.f) * 256)); WriteChar ((char)((a_Player.GetPitch() / 360.f) * 256));
WriteShort (HeldItem.IsEmpty() ? 0 : HeldItem.m_ItemType); WriteShort (HeldItem.IsEmpty() ? 0 : HeldItem.m_ItemType);
Flush(); Flush();
} }
@ -790,9 +787,9 @@ void cProtocol125::SendPluginMessage(const AString & a_Channel, const AString &
void cProtocol125::SendRemoveEntityEffect(const cEntity & a_Entity, int a_EffectID) void cProtocol125::SendRemoveEntityEffect(const cEntity & a_Entity, int a_EffectID)
{ {
cCSLock Lock(m_CSPacket); cCSLock Lock(m_CSPacket);
WriteByte (PACKET_REMOVE_ENTITY_EFFECT); WriteByte(PACKET_REMOVE_ENTITY_EFFECT);
WriteInt (a_Entity.GetUniqueID()); WriteInt (a_Entity.GetUniqueID());
WriteByte (a_EffectID); WriteChar((char)a_EffectID);
Flush(); Flush();
} }
@ -806,7 +803,7 @@ void cProtocol125::SendRespawn(void)
WriteByte (PACKET_RESPAWN); WriteByte (PACKET_RESPAWN);
WriteInt ((int)(m_Client->GetPlayer()->GetWorld()->GetDimension())); WriteInt ((int)(m_Client->GetPlayer()->GetWorld()->GetDimension()));
WriteByte (2); // TODO: Difficulty; 2 = Normal WriteByte (2); // TODO: Difficulty; 2 = Normal
WriteByte ((char)m_Client->GetPlayer()->GetGameMode()); WriteChar ((char)m_Client->GetPlayer()->GetGameMode());
WriteShort (256); // Current world height WriteShort (256); // Current world height
WriteString("default"); WriteString("default");
} }
@ -837,7 +834,7 @@ void cProtocol125::SendExperienceOrb(const cExpOrb & a_ExpOrb)
WriteInt((int) a_ExpOrb.GetPosX()); WriteInt((int) a_ExpOrb.GetPosX());
WriteInt((int) a_ExpOrb.GetPosY()); WriteInt((int) a_ExpOrb.GetPosY());
WriteInt((int) a_ExpOrb.GetPosZ()); WriteInt((int) a_ExpOrb.GetPosZ());
WriteShort(a_ExpOrb.GetReward()); WriteShort((short)a_ExpOrb.GetReward());
Flush(); Flush();
} }
@ -878,7 +875,7 @@ void cProtocol125::SendSpawnMob(const cMonster & a_Mob)
cCSLock Lock(m_CSPacket); cCSLock Lock(m_CSPacket);
WriteByte (PACKET_SPAWN_MOB); WriteByte (PACKET_SPAWN_MOB);
WriteInt (a_Mob.GetUniqueID()); WriteInt (a_Mob.GetUniqueID());
WriteByte (a_Mob.GetMobType()); WriteByte ((Byte)a_Mob.GetMobType());
WriteVectorI((Vector3i)(a_Mob.GetPosition() * 32)); WriteVectorI((Vector3i)(a_Mob.GetPosition() * 32));
WriteByte (0); WriteByte (0);
WriteByte (0); WriteByte (0);
@ -903,7 +900,7 @@ void cProtocol125::SendSpawnObject(const cEntity & a_Entity, char a_ObjectType,
cCSLock Lock(m_CSPacket); cCSLock Lock(m_CSPacket);
WriteByte(PACKET_SPAWN_OBJECT); WriteByte(PACKET_SPAWN_OBJECT);
WriteInt (a_Entity.GetUniqueID()); WriteInt (a_Entity.GetUniqueID());
WriteByte(a_ObjectType); WriteChar(a_ObjectType);
WriteInt ((int)(a_Entity.GetPosX() * 32)); WriteInt ((int)(a_Entity.GetPosX() * 32));
WriteInt ((int)(a_Entity.GetPosY() * 32)); WriteInt ((int)(a_Entity.GetPosY() * 32));
WriteInt ((int)(a_Entity.GetPosZ() * 32)); WriteInt ((int)(a_Entity.GetPosZ() * 32));
@ -928,7 +925,7 @@ void cProtocol125::SendSpawnVehicle(const cEntity & a_Vehicle, char a_VehicleTyp
cCSLock Lock(m_CSPacket); cCSLock Lock(m_CSPacket);
WriteByte (PACKET_SPAWN_OBJECT); WriteByte (PACKET_SPAWN_OBJECT);
WriteInt (a_Vehicle.GetUniqueID()); WriteInt (a_Vehicle.GetUniqueID());
WriteByte (a_VehicleType); WriteChar (a_VehicleType);
WriteInt ((int)(a_Vehicle.GetPosX() * 32)); WriteInt ((int)(a_Vehicle.GetPosX() * 32));
WriteInt ((int)(a_Vehicle.GetPosY() * 32)); WriteInt ((int)(a_Vehicle.GetPosY() * 32));
WriteInt ((int)(a_Vehicle.GetPosZ() * 32)); WriteInt ((int)(a_Vehicle.GetPosZ() * 32));
@ -966,8 +963,8 @@ void cProtocol125::SendTeleportEntity(const cEntity & a_Entity)
WriteInt ((int)(floor(a_Entity.GetPosX() * 32))); WriteInt ((int)(floor(a_Entity.GetPosX() * 32)));
WriteInt ((int)(floor(a_Entity.GetPosY() * 32))); WriteInt ((int)(floor(a_Entity.GetPosY() * 32)));
WriteInt ((int)(floor(a_Entity.GetPosZ() * 32))); WriteInt ((int)(floor(a_Entity.GetPosZ() * 32)));
WriteByte ((char)((a_Entity.GetYaw() / 360.f) * 256)); WriteChar ((char)((a_Entity.GetYaw() / 360.f) * 256));
WriteByte ((char)((a_Entity.GetPitch() / 360.f) * 256)); WriteChar ((char)((a_Entity.GetPitch() / 360.f) * 256));
Flush(); Flush();
} }
@ -1042,7 +1039,7 @@ void cProtocol125::SendUseBed(const cEntity & a_Entity, int a_BlockX, int a_Bloc
WriteInt (a_Entity.GetUniqueID()); WriteInt (a_Entity.GetUniqueID());
WriteByte(0); // Unknown byte only 0 has been observed WriteByte(0); // Unknown byte only 0 has been observed
WriteInt (a_BlockX); WriteInt (a_BlockX);
WriteByte(a_BlockY); WriteByte((Byte)a_BlockY);
WriteInt (a_BlockZ); WriteInt (a_BlockZ);
Flush(); Flush();
} }
@ -1086,7 +1083,7 @@ void cProtocol125::SendWholeInventory(const cWindow & a_Window)
cCSLock Lock(m_CSPacket); cCSLock Lock(m_CSPacket);
cItems Slots; cItems Slots;
a_Window.GetSlots(*(m_Client->GetPlayer()), Slots); a_Window.GetSlots(*(m_Client->GetPlayer()), Slots);
SendWindowSlots(a_Window.GetWindowID(), Slots.size(), &(Slots[0])); SendWindowSlots(a_Window.GetWindowID(), (int)Slots.size(), &(Slots[0]));
} }
@ -1103,7 +1100,7 @@ void cProtocol125::SendWindowClose(const cWindow & a_Window)
cCSLock Lock(m_CSPacket); cCSLock Lock(m_CSPacket);
WriteByte(PACKET_WINDOW_CLOSE); WriteByte(PACKET_WINDOW_CLOSE);
WriteByte(a_Window.GetWindowID()); WriteChar(a_Window.GetWindowID());
Flush(); Flush();
} }
@ -1120,10 +1117,10 @@ void cProtocol125::SendWindowOpen(const cWindow & a_Window)
} }
cCSLock Lock(m_CSPacket); cCSLock Lock(m_CSPacket);
WriteByte (PACKET_WINDOW_OPEN); WriteByte (PACKET_WINDOW_OPEN);
WriteByte (a_Window.GetWindowID()); WriteChar (a_Window.GetWindowID());
WriteByte (a_Window.GetWindowType()); WriteByte ((Byte)a_Window.GetWindowType());
WriteString(a_Window.GetWindowTitle()); WriteString(a_Window.GetWindowTitle());
WriteByte (a_Window.GetNumNonInventorySlots()); WriteByte ((Byte)a_Window.GetNumNonInventorySlots());
Flush(); Flush();
} }
@ -1135,7 +1132,7 @@ void cProtocol125::SendWindowProperty(const cWindow & a_Window, short a_Property
{ {
cCSLock Lock(m_CSPacket); cCSLock Lock(m_CSPacket);
WriteByte (PACKET_WINDOW_PROPERTY); WriteByte (PACKET_WINDOW_PROPERTY);
WriteByte (a_Window.GetWindowID()); WriteChar (a_Window.GetWindowID());
WriteShort(a_Property); WriteShort(a_Property);
WriteShort(a_Value); WriteShort(a_Value);
Flush(); Flush();
@ -1527,7 +1524,7 @@ int cProtocol125::ParsePluginMessage(void)
HANDLE_PACKET_READ(ReadBEUTF16String16, AString, ChannelName); HANDLE_PACKET_READ(ReadBEUTF16String16, AString, ChannelName);
HANDLE_PACKET_READ(ReadBEShort, short, Length); HANDLE_PACKET_READ(ReadBEShort, short, Length);
AString Data; AString Data;
if (!m_ReceivedData.ReadString(Data, Length)) if (!m_ReceivedData.ReadString(Data, (size_t)Length))
{ {
m_ReceivedData.CheckValid(); m_ReceivedData.CheckValid();
return PARSE_INCOMPLETE; return PARSE_INCOMPLETE;
@ -1688,7 +1685,7 @@ void cProtocol125::SendPreChunk(int a_ChunkX, int a_ChunkZ, bool a_ShouldLoad)
void cProtocol125::SendWindowSlots(char a_WindowID, int a_NumItems, const cItem * a_Items) void cProtocol125::SendWindowSlots(char a_WindowID, int a_NumItems, const cItem * a_Items)
{ {
WriteByte (PACKET_INVENTORY_WHOLE); WriteByte (PACKET_INVENTORY_WHOLE);
WriteByte (a_WindowID); WriteChar (a_WindowID);
WriteShort((short)a_NumItems); WriteShort((short)a_NumItems);
for (int j = 0; j < a_NumItems; j++) for (int j = 0; j < a_NumItems; j++)
@ -1718,7 +1715,7 @@ void cProtocol125::WriteItem(const cItem & a_Item)
return; return;
} }
WriteByte (a_Item.m_ItemCount); WriteChar (a_Item.m_ItemCount);
WriteShort(a_Item.m_ItemDamage); WriteShort(a_Item.m_ItemDamage);
if (cItem::IsEnchantable(a_Item.m_ItemType)) if (cItem::IsEnchantable(a_Item.m_ItemType))
@ -1765,7 +1762,7 @@ int cProtocol125::ParseItem(cItem & a_Item)
} }
// TODO: Enchantment not implemented yet! // TODO: Enchantment not implemented yet!
if (!m_ReceivedData.SkipRead(EnchantNumBytes)) if (!m_ReceivedData.SkipRead((size_t)EnchantNumBytes))
{ {
return PARSE_INCOMPLETE; return PARSE_INCOMPLETE;
} }
@ -1850,7 +1847,7 @@ void cProtocol125::WriteMobMetadata(const cMonster & a_Mob)
case cMonster::mtCreeper: case cMonster::mtCreeper:
{ {
WriteByte(0x10); WriteByte(0x10);
WriteByte(((const cCreeper &)a_Mob).IsBlowing() ? 1 : -1); // Blowing up? WriteChar(((const cCreeper &)a_Mob).IsBlowing() ? 1 : -1); // Blowing up?
WriteByte(0x11); WriteByte(0x11);
WriteByte(((const cCreeper &)a_Mob).IsCharged() ? 1 : 0); // Lightning-charged? WriteByte(((const cCreeper &)a_Mob).IsCharged() ? 1 : 0); // Lightning-charged?
break; break;
@ -1920,9 +1917,9 @@ void cProtocol125::WriteMobMetadata(const cMonster & a_Mob)
WriteByte(0x10); WriteByte(0x10);
Byte SheepMetadata = 0; Byte SheepMetadata = 0;
SheepMetadata = ((const cSheep &)a_Mob).GetFurColor(); // Fur colour SheepMetadata = (Byte)((const cSheep &)a_Mob).GetFurColor();
if (((const cSheep &)a_Mob).IsSheared()) // Is sheared? if (((const cSheep &)a_Mob).IsSheared())
{ {
SheepMetadata |= 0x16; SheepMetadata |= 0x16;
} }
@ -1954,7 +1951,7 @@ void cProtocol125::WriteMobMetadata(const cMonster & a_Mob)
case cMonster::mtWither: case cMonster::mtWither:
{ {
WriteByte(0x54); // Int at index 20 WriteByte(0x54); // Int at index 20
WriteInt(((const cWither &)a_Mob).GetNumInvulnerableTicks()); WriteInt((Int32)((const cWither &)a_Mob).GetNumInvulnerableTicks());
WriteByte(0x66); // Float at index 6 WriteByte(0x66); // Float at index 6
WriteFloat((float)(a_Mob.GetHealth())); WriteFloat((float)(a_Mob.GetHealth()));
break; break;
@ -1965,11 +1962,11 @@ void cProtocol125::WriteMobMetadata(const cMonster & a_Mob)
WriteByte(0x10); WriteByte(0x10);
if (a_Mob.GetMobType() == cMonster::mtSlime) if (a_Mob.GetMobType() == cMonster::mtSlime)
{ {
WriteByte(((const cSlime &)a_Mob).GetSize()); // Size of slime - HEWGE, meh, cute BABBY SLIME WriteByte((Byte)((const cSlime &)a_Mob).GetSize()); // Size of slime - HEWGE, meh, cute BABBY SLIME
} }
else else
{ {
WriteByte(((const cMagmaCube &)a_Mob).GetSize()); // Size of slime - HEWGE, meh, cute BABBY SLIME WriteByte((Byte)((const cMagmaCube &)a_Mob).GetSize()); // Size of slime - HEWGE, meh, cute BABBY SLIME
} }
break; break;
} }
@ -2008,7 +2005,7 @@ void cProtocol125::WriteMobMetadata(const cMonster & a_Mob)
WriteInt(Flags); WriteInt(Flags);
WriteByte(0x13); WriteByte(0x13);
WriteByte(((const cHorse &)a_Mob).GetHorseType()); // Type of horse (donkey, chestnut, etc.) WriteByte((Byte)((const cHorse &)a_Mob).GetHorseType()); // Type of horse (donkey, chestnut, etc.)
WriteByte(0x54); WriteByte(0x54);
int Appearance = 0; int Appearance = 0;
@ -2020,6 +2017,10 @@ void cProtocol125::WriteMobMetadata(const cMonster & a_Mob)
WriteInt(((const cHorse &)a_Mob).GetHorseArmour()); // Horshey armour WriteInt(((const cHorse &)a_Mob).GetHorseArmour()); // Horshey armour
break; break;
} }
default:
{
break;
}
} }
} }

8
src/Protocol/Protocol16x.cpp
View File

@ -119,7 +119,7 @@ void cProtocol161::SendHealth(void)
cCSLock Lock(m_CSPacket); cCSLock Lock(m_CSPacket);
WriteByte (PACKET_UPDATE_HEALTH); WriteByte (PACKET_UPDATE_HEALTH);
WriteFloat((float)m_Client->GetPlayer()->GetHealth()); WriteFloat((float)m_Client->GetPlayer()->GetHealth());
WriteShort(m_Client->GetPlayer()->GetFoodLevel()); WriteShort((short)m_Client->GetPlayer()->GetFoodLevel());
WriteFloat((float)m_Client->GetPlayer()->GetFoodSaturationLevel()); WriteFloat((float)m_Client->GetPlayer()->GetFoodSaturationLevel());
Flush(); Flush();
} }
@ -163,10 +163,10 @@ void cProtocol161::SendWindowOpen(const cWindow & a_Window)
} }
cCSLock Lock(m_CSPacket); cCSLock Lock(m_CSPacket);
WriteByte (PACKET_WINDOW_OPEN); WriteByte (PACKET_WINDOW_OPEN);
WriteByte (a_Window.GetWindowID()); WriteChar (a_Window.GetWindowID());
WriteByte (a_Window.GetWindowType()); WriteByte ((Byte)a_Window.GetWindowType());
WriteString(a_Window.GetWindowTitle()); WriteString(a_Window.GetWindowTitle());
WriteByte (a_Window.GetNumNonInventorySlots()); WriteByte ((Byte)a_Window.GetNumNonInventorySlots());
WriteByte (1); // Use title WriteByte (1); // Use title
if (a_Window.GetWindowType() == cWindow::wtAnimalChest) if (a_Window.GetWindowType() == cWindow::wtAnimalChest)
{ {

2
src/Protocol/Protocol17x.cpp
View File

@ -1236,7 +1236,7 @@ void cProtocol172::SendWindowProperty(const cWindow & a_Window, short a_Property
void cProtocol172::AddReceivedData(const char * a_Data, int a_Size) void cProtocol172::AddReceivedData(const char * a_Data, size_t a_Size)
{ {
// Write the incoming data into the comm log file: // Write the incoming data into the comm log file:
if (g_ShouldLogCommIn) if (g_ShouldLogCommIn)

4
src/Protocol/Protocol17x.h
View File

@ -196,7 +196,7 @@ protected:
m_Out.WriteVarUTF8String(a_Value); m_Out.WriteVarUTF8String(a_Value);
} }
void WriteBuf(const char * a_Data, int a_Size) void WriteBuf(const char * a_Data, size_t a_Size)
{ {
m_Out.Write(a_Data, a_Size); m_Out.Write(a_Data, a_Size);
} }
@ -243,7 +243,7 @@ protected:
/** Adds the received (unencrypted) data to m_ReceivedData, parses complete packets */ /** Adds the received (unencrypted) data to m_ReceivedData, parses complete packets */
void AddReceivedData(const char * a_Data, int a_Size); void AddReceivedData(const char * a_Data, size_t a_Size);
/** Reads and handles the packet. The packet length and type have already been read. /** Reads and handles the packet. The packet length and type have already been read.
Returns true if the packet was understood, false if it was an unknown packet Returns true if the packet was understood, false if it was an unknown packet

6
src/Protocol/ProtocolRecognizer.cpp
View File

@ -854,7 +854,7 @@ bool cProtocolRecognizer::TryRecognizeProtocol(void)
// This must be a lengthed protocol, try if it has the entire initial handshake packet: // This must be a lengthed protocol, try if it has the entire initial handshake packet:
m_Buffer.ResetRead(); m_Buffer.ResetRead();
UInt32 PacketLen; UInt32 PacketLen;
UInt32 ReadSoFar = m_Buffer.GetReadableSpace(); UInt32 ReadSoFar = (UInt32)m_Buffer.GetReadableSpace();
if (!m_Buffer.ReadVarInt(PacketLen)) if (!m_Buffer.ReadVarInt(PacketLen))
{ {
// Not enough bytes for the packet length, keep waiting // Not enough bytes for the packet length, keep waiting
@ -931,7 +931,7 @@ bool cProtocolRecognizer::TryRecognizeLengthlessProtocol(void)
bool cProtocolRecognizer::TryRecognizeLengthedProtocol(UInt32 a_PacketLengthRemaining) bool cProtocolRecognizer::TryRecognizeLengthedProtocol(UInt32 a_PacketLengthRemaining)
{ {
UInt32 PacketType; UInt32 PacketType;
UInt32 NumBytesRead = m_Buffer.GetReadableSpace(); UInt32 NumBytesRead = (UInt32)m_Buffer.GetReadableSpace();
if (!m_Buffer.ReadVarInt(PacketType)) if (!m_Buffer.ReadVarInt(PacketType))
{ {
return false; return false;
@ -962,7 +962,7 @@ bool cProtocolRecognizer::TryRecognizeLengthedProtocol(UInt32 a_PacketLengthRema
m_Buffer.ReadBEShort(ServerPort); m_Buffer.ReadBEShort(ServerPort);
m_Buffer.ReadVarInt(NextState); m_Buffer.ReadVarInt(NextState);
m_Buffer.CommitRead(); m_Buffer.CommitRead();
m_Protocol = new cProtocol172(m_Client, ServerAddress, ServerPort, NextState); m_Protocol = new cProtocol172(m_Client, ServerAddress, (UInt16)ServerPort, NextState);
return true; return true;
} }
} }