From 0cc3ab7c1ee21ea35ebe3ff17f641477dd34f9ec Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Fri, 28 Dec 2012 02:45:20 +0000 Subject: cPickup now uses full cItem, instead of a pointer git-svn-id: http://mc-server.googlecode.com/svn/trunk@1114 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Protocol/Protocol125.cpp | 6 +++--- source/Protocol/Protocol14x.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source/Protocol') diff --git a/source/Protocol/Protocol125.cpp b/source/Protocol/Protocol125.cpp index cb1e46193..0b5acc771 100644 --- a/source/Protocol/Protocol125.cpp +++ b/source/Protocol/Protocol125.cpp @@ -477,9 +477,9 @@ void cProtocol125::SendPickupSpawn(const cPickup & a_Pickup) cCSLock Lock(m_CSPacket); WriteByte (PACKET_PICKUP_SPAWN); WriteInt (a_Pickup.GetUniqueID()); - WriteShort (a_Pickup.GetItem()->m_ItemType); - WriteByte (a_Pickup.GetItem()->m_ItemCount); - WriteShort (a_Pickup.GetItem()->m_ItemDamage); + WriteShort (a_Pickup.GetItem().m_ItemType); + WriteByte (a_Pickup.GetItem().m_ItemCount); + WriteShort (a_Pickup.GetItem().m_ItemDamage); WriteVectorI((Vector3i)(a_Pickup.GetPosition() * 32)); WriteByte ((char)(a_Pickup.GetSpeed().x * 8)); WriteByte ((char)(a_Pickup.GetSpeed().y * 8)); diff --git a/source/Protocol/Protocol14x.cpp b/source/Protocol/Protocol14x.cpp index 1cb4c922d..912a1a266 100644 --- a/source/Protocol/Protocol14x.cpp +++ b/source/Protocol/Protocol14x.cpp @@ -98,7 +98,7 @@ void cProtocol142::SendPickupSpawn(const cPickup & a_Pickup) cCSLock Lock(m_CSPacket); WriteByte (PACKET_PICKUP_SPAWN); WriteInt (a_Pickup.GetUniqueID()); - WriteItem (*(a_Pickup.GetItem())); + WriteItem (a_Pickup.GetItem()); WriteVectorI((Vector3i)(a_Pickup.GetPosition() * 32)); WriteByte ((char)(a_Pickup.GetSpeed().x * 8)); WriteByte ((char)(a_Pickup.GetSpeed().y * 8)); @@ -155,7 +155,7 @@ cProtocol146::cProtocol146(cClientHandle * a_Client) : void cProtocol146::SendPickupSpawn(const cPickup & a_Pickup) { - ASSERT(!a_Pickup.GetItem()->IsEmpty()); + ASSERT(!a_Pickup.GetItem().IsEmpty()); cCSLock Lock(m_CSPacket); @@ -177,7 +177,7 @@ void cProtocol146::SendPickupSpawn(const cPickup & a_Pickup) WriteByte(PACKET_ENTITY_METADATA); WriteInt(a_Pickup.GetUniqueID()); WriteByte(0xaa); // a slot value at index 10 - WriteItem(*a_Pickup.GetItem()); + WriteItem(a_Pickup.GetItem()); WriteByte(0x7f); // End of metadata Flush(); } -- cgit v1.2.3