From d7068b35a85f0c0248a5533240087747d02e1a17 Mon Sep 17 00:00:00 2001 From: "lapayo94@gmail.com" Date: Sun, 1 Jan 2012 04:55:17 +0000 Subject: - implemented separated inventory for creative mode (cSurvivalInventory and cCreativeInventory) (Separation is not perfect yet, because maybe there are some mayor changes needed :D) - implemented CreativeInventoryAction (was mistakenly called CreateInventoryAction) -> Fixed meta data for creative selected blocks ->->Slabs/Steps are now placed correctly - slabs can now be build to a double slab - fixed a bug in the inventory which put items with different meta values in the same slot git-svn-id: http://mc-server.googlecode.com/svn/trunk@160 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/packets/cPacket_CreateInventoryAction.cpp | 59 ---------------------- source/packets/cPacket_CreateInventoryAction.h | 29 ----------- source/packets/cPacket_CreativeInventoryAction.cpp | 54 ++++++++++++++++++++ source/packets/cPacket_CreativeInventoryAction.h | 29 +++++++++++ 4 files changed, 83 insertions(+), 88 deletions(-) delete mode 100644 source/packets/cPacket_CreateInventoryAction.cpp delete mode 100644 source/packets/cPacket_CreateInventoryAction.h create mode 100644 source/packets/cPacket_CreativeInventoryAction.cpp create mode 100644 source/packets/cPacket_CreativeInventoryAction.h (limited to 'source/packets') diff --git a/source/packets/cPacket_CreateInventoryAction.cpp b/source/packets/cPacket_CreateInventoryAction.cpp deleted file mode 100644 index 9ccc9f383..000000000 --- a/source/packets/cPacket_CreateInventoryAction.cpp +++ /dev/null @@ -1,59 +0,0 @@ -#include "cPacket_CreateInventoryAction.h" -#include "cPacket_ItemData.h" - -cPacket_CreateInventoryAction::cPacket_CreateInventoryAction( const cPacket_CreateInventoryAction & a_Copy ) -{ - m_PacketID = E_CREATE_INVENTORY_ACTION; - m_Slot = a_Copy.m_Slot; - m_ItemID = a_Copy.m_ItemID; - m_Quantity = 0; - m_Damage = 0; -} - -bool cPacket_CreateInventoryAction::Parse(cSocket & a_Socket) -{ - m_Socket = a_Socket; - if( !ReadShort ( m_Slot ) ) return false; - /* - if( !ReadShort ( m_ItemID ) ) return false; - if( !ReadShort ( m_Quantity ) ) return false; - if( !ReadShort ( m_Damage ) ) return false; - */ - - cPacket_ItemData Item; - - Item.Parse(m_Socket); - - m_ItemID = Item.m_ItemID; - m_Quantity = Item.m_ItemCount; - m_Damage = Item.m_ItemUses; - - - return true; -} - -bool cPacket_CreateInventoryAction::Send(cSocket & a_Socket) -{ - //LOG("InventoryChange:"); - unsigned int TotalSize = c_Size; - - cPacket_ItemData Item; - - TotalSize += Item.GetSize(m_ItemID); - - char* Message = new char[TotalSize]; - - if( m_ItemID <= 0 ) m_ItemID = -1; // Fix, to make sure no invalid values are sent. - // WARNING: HERE ITS -1, BUT IN NAMED ENTITY SPAWN PACKET ITS 0 !! - //LOG("cPacket_CreateInventoryAction: Sending Creative item ID: %i", m_ItemID ); - - unsigned int i = 0; - AppendByte ( (char)m_PacketID, Message, i ); - AppendShort ( m_Slot, Message, i ); - - Item.AppendItem(Message, i, m_ItemID, m_Quantity, m_Damage); - - bool RetVal = !cSocket::IsSocketError( SendData( a_Socket, Message, TotalSize, 0 ) ); - delete [] Message; - return RetVal; -} diff --git a/source/packets/cPacket_CreateInventoryAction.h b/source/packets/cPacket_CreateInventoryAction.h deleted file mode 100644 index 083e05446..000000000 --- a/source/packets/cPacket_CreateInventoryAction.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include "cPacket.h" -#include "PacketID.h" - -//Sure itīs not Creative Inventory? - -class cPacket_CreateInventoryAction : public cPacket -{ -public: - cPacket_CreateInventoryAction() - : m_Slot( 0 ) - , m_ItemID( 0 ) - , m_Quantity( 0 ) - , m_Damage( 0 ) - { m_PacketID = E_CREATE_INVENTORY_ACTION; m_Quantity = 1; } - cPacket_CreateInventoryAction( const cPacket_CreateInventoryAction & a_Copy ); - virtual cPacket* Clone() const { return new cPacket_CreateInventoryAction(*this); } - - bool Parse(cSocket & a_Socket); - bool Send(cSocket & a_Socket); - - short m_Slot; // 0 = hold 1-4 = armor - short m_ItemID; - char m_Quantity; //Byte not short ;) - short m_Damage; - - static const unsigned int c_Size = 1 + 2; -}; diff --git a/source/packets/cPacket_CreativeInventoryAction.cpp b/source/packets/cPacket_CreativeInventoryAction.cpp new file mode 100644 index 000000000..834a3c2fe --- /dev/null +++ b/source/packets/cPacket_CreativeInventoryAction.cpp @@ -0,0 +1,54 @@ +#include "cPacket_CreativeInventoryAction.h" +#include "cPacket_ItemData.h" + +cPacket_CreativeInventoryAction::cPacket_CreativeInventoryAction( const cPacket_CreativeInventoryAction & a_Copy ) +{ + m_PacketID = E_CREATIVE_INVENTORY_ACTION; + m_Slot = a_Copy.m_Slot; + m_ItemID = a_Copy.m_ItemID; + m_Quantity = a_Copy.m_Quantity; + m_Damage = a_Copy.m_Damage; +} + +bool cPacket_CreativeInventoryAction::Parse(cSocket & a_Socket) +{ + m_Socket = a_Socket; + if( !ReadShort ( m_Slot ) ) return false; + + cPacket_ItemData Item; + + Item.Parse(m_Socket); + + m_ItemID = Item.m_ItemID; + m_Quantity = Item.m_ItemCount; + m_Damage = Item.m_ItemUses; + + + return true; +} + +bool cPacket_CreativeInventoryAction::Send(cSocket & a_Socket) +{ + //LOG("InventoryChange:"); + unsigned int TotalSize = c_Size; + + cPacket_ItemData Item; + + TotalSize += Item.GetSize(m_ItemID); + + char* Message = new char[TotalSize]; + + if( m_ItemID <= 0 ) m_ItemID = -1; // Fix, to make sure no invalid values are sent. + // WARNING: HERE ITS -1, BUT IN NAMED ENTITY SPAWN PACKET ITS 0 !! + //LOG("cPacket_CreateInventoryAction: Sending Creative item ID: %i", m_ItemID ); + + unsigned int i = 0; + AppendByte ( (char)m_PacketID, Message, i ); + AppendShort ( m_Slot, Message, i ); + + Item.AppendItem(Message, i, m_ItemID, m_Quantity, m_Damage); + + bool RetVal = !cSocket::IsSocketError( SendData( a_Socket, Message, TotalSize, 0 ) ); + delete [] Message; + return RetVal; +} diff --git a/source/packets/cPacket_CreativeInventoryAction.h b/source/packets/cPacket_CreativeInventoryAction.h new file mode 100644 index 000000000..bb50c25db --- /dev/null +++ b/source/packets/cPacket_CreativeInventoryAction.h @@ -0,0 +1,29 @@ +#pragma once + +#include "cPacket.h" +#include "PacketID.h" + +//Sure itīs not Creative Inventory? + +class cPacket_CreativeInventoryAction : public cPacket +{ +public: + cPacket_CreativeInventoryAction() + : m_Slot( 0 ) + , m_ItemID( 0 ) + , m_Quantity( 0 ) + , m_Damage( 0 ) + { m_PacketID = E_CREATIVE_INVENTORY_ACTION; m_Quantity = 1; } + cPacket_CreativeInventoryAction( const cPacket_CreativeInventoryAction & a_Copy ); + virtual cPacket* Clone() const { return new cPacket_CreativeInventoryAction(*this); } + + bool Parse(cSocket & a_Socket); + bool Send(cSocket & a_Socket); + + short m_Slot; // 0 = hold 1-4 = armor + short m_ItemID; + char m_Quantity; //Byte not short ;) + short m_Damage; + + static const unsigned int c_Size = 1 + 2; +}; -- cgit v1.2.3