Another handful of packets rewritten.
Also changed cItem::m_ItemID into m_ItemType of type short. Easier handling. m_ItemID kept for compatibility reasons (Lua-interface etc.) git-svn-id: http://mc-server.googlecode.com/svn/trunk@756 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
@@ -25,28 +25,28 @@ cPacket_WholeInventory::cPacket_WholeInventory( const cPacket_WholeInventory & a
|
||||
|
||||
|
||||
|
||||
cPacket_WholeInventory::cPacket_WholeInventory(cInventory * a_Inventory)
|
||||
cPacket_WholeInventory::cPacket_WholeInventory(const cInventory & a_Inventory)
|
||||
{
|
||||
m_PacketID = E_INVENTORY_WHOLE;
|
||||
m_WindowID = 0;
|
||||
m_Count = a_Inventory->c_NumSlots;
|
||||
m_Items = new cItem[m_Count];
|
||||
m_WindowID = 0; // Inventory window has a constant ID of 0
|
||||
m_Count = a_Inventory.c_NumSlots;
|
||||
m_Items = new cItem[m_Count];
|
||||
// TODO: copy items one by one, they may have some values that needn't be shallow-copiable
|
||||
memcpy( m_Items, a_Inventory->GetSlots(), sizeof(cItem)*m_Count );
|
||||
memcpy( m_Items, a_Inventory.GetSlots(), sizeof(cItem) * m_Count);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
cPacket_WholeInventory::cPacket_WholeInventory(cWindow * a_Window)
|
||||
cPacket_WholeInventory::cPacket_WholeInventory(const cWindow & a_Window)
|
||||
{
|
||||
m_PacketID = E_INVENTORY_WHOLE;
|
||||
m_WindowID = (char)a_Window->GetWindowID();
|
||||
m_Count = (short)a_Window->GetNumSlots();
|
||||
m_Items = new cItem[m_Count];
|
||||
m_WindowID = (char)a_Window.GetWindowID();
|
||||
m_Count = (short)a_Window.GetNumSlots();
|
||||
m_Items = new cItem[m_Count];
|
||||
// TODO: copy items one by one, they may have some values that needn't be shallow-copiable
|
||||
memcpy( m_Items, a_Window->GetSlots(), sizeof(cItem) * m_Count);
|
||||
memcpy( m_Items, a_Window.GetSlots(), sizeof(cItem) * m_Count);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user