summaryrefslogtreecommitdiffstats
path: root/source/packets
diff options
context:
space:
mode:
authorlapayo94@gmail.com <lapayo94@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2011-12-22 17:30:40 +0100
committerlapayo94@gmail.com <lapayo94@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2011-12-22 17:30:40 +0100
commite54373160b69c342dd1a625a841bda3707ba7acf (patch)
tree2a01aba188c6d79ab366cb4dbb0a4dc94ff31a55 /source/packets
parentMissed a class in r94 ;) Sorry guys :D (diff)
downloadcuberite-e54373160b69c342dd1a625a841bda3707ba7acf.tar
cuberite-e54373160b69c342dd1a625a841bda3707ba7acf.tar.gz
cuberite-e54373160b69c342dd1a625a841bda3707ba7acf.tar.bz2
cuberite-e54373160b69c342dd1a625a841bda3707ba7acf.tar.lz
cuberite-e54373160b69c342dd1a625a841bda3707ba7acf.tar.xz
cuberite-e54373160b69c342dd1a625a841bda3707ba7acf.tar.zst
cuberite-e54373160b69c342dd1a625a841bda3707ba7acf.zip
Diffstat (limited to 'source/packets')
-rw-r--r--source/packets/cPacket_AddToInventory.cpp4
-rw-r--r--source/packets/cPacket_ItemData.cpp2
-rw-r--r--source/packets/cPacket_WholeInventory.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/source/packets/cPacket_AddToInventory.cpp b/source/packets/cPacket_AddToInventory.cpp
index 0a9dad8c0..72f099e2f 100644
--- a/source/packets/cPacket_AddToInventory.cpp
+++ b/source/packets/cPacket_AddToInventory.cpp
@@ -9,14 +9,14 @@ bool cPacket_AddToInventory::Send( cSocket & a_Socket )
cPacket_ItemData Item;
- TotalSize += Item.GetSize(m_ItemType);
+ TotalSize += Item.GetSize((short) m_ItemType);
char* Message = new char[TotalSize];
unsigned int i = 0;
AppendByte ( (char) m_PacketID, Message, i );
- Item.AppendItem(Message, i, m_ItemType, m_Count, this->m_Life);
+ Item.AppendItem(Message, i, (short) m_ItemType, m_Count, this->m_Life);
bool RetVal = !cSocket::IsSocketError( SendData( a_Socket, Message, TotalSize, 0 ) );
delete [] Message;
diff --git a/source/packets/cPacket_ItemData.cpp b/source/packets/cPacket_ItemData.cpp
index 60772d690..1c1d13c60 100644
--- a/source/packets/cPacket_ItemData.cpp
+++ b/source/packets/cPacket_ItemData.cpp
@@ -42,7 +42,7 @@ int cPacket_ItemData::GetSize(short a_ItemID)
void cPacket_ItemData::AppendItem(char* a_Message, unsigned int &a_Iterator, cItem *a_Item)
{
- return AppendItem(a_Message, a_Iterator, a_Item->m_ItemID, a_Item->m_ItemCount, a_Item->m_ItemHealth);
+ return AppendItem(a_Message, a_Iterator, (short) a_Item->m_ItemID, a_Item->m_ItemCount, a_Item->m_ItemHealth);
}
void cPacket_ItemData::AppendItem(char* a_Message, unsigned int &a_Iterator, short a_ItemID, char a_Quantity, short a_Damage)
diff --git a/source/packets/cPacket_WholeInventory.cpp b/source/packets/cPacket_WholeInventory.cpp
index 4bc68ed0b..f9b7be2c4 100644
--- a/source/packets/cPacket_WholeInventory.cpp
+++ b/source/packets/cPacket_WholeInventory.cpp
@@ -44,7 +44,7 @@ bool cPacket_WholeInventory::Send(cSocket & a_Socket)
for(int i = 0; i < m_Count; i++)
{
- TotalSize += Item.GetSize(m_Items[i].m_ItemID);
+ TotalSize += Item.GetSize((short) m_Items[i].m_ItemID);
}
char* Message = new char[TotalSize];