1
0

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:
madmaxoft@gmail.com
2012-08-19 11:51:17 +00:00
parent f6ae6002c3
commit eb3ed1aec1
25 changed files with 376 additions and 183 deletions

View File

@@ -10,10 +10,6 @@
#include "cWindowOwner.h"
#include "items/Item.h"
#include "packets/cPacket_WholeInventory.h"
#include "packets/cPacket_WindowOpen.h"
#include "packets/cPacket_WindowClose.h"
@@ -239,12 +235,7 @@ void cWindow::Open( cPlayer & a_Player )
m_OpenedBy.push_back( &a_Player );
}
cPacket_WindowOpen WindowOpen;
WindowOpen.m_WindowID = (char)m_WindowID;
WindowOpen.m_InventoryType = (char)m_WindowType;
WindowOpen.m_WindowTitle = m_WindowTitle;
WindowOpen.m_NumSlots = (char)m_NumSlots;
a_Player.GetClientHandle()->Send( WindowOpen );
a_Player.GetClientHandle()->SendWindowOpen(m_WindowID, m_WindowType, m_WindowTitle, m_NumSlots);
}
@@ -260,12 +251,10 @@ void cWindow::Close( cPlayer & a_Player )
a_Player.TossItem(true, m_DraggingItem->m_ItemCount);
}
cPacket_WindowClose WindowClose;
WindowClose.m_Close = (char)m_WindowID;
cClientHandle * ClientHandle = a_Player.GetClientHandle();
if (ClientHandle != NULL)
{
ClientHandle->Send(WindowClose);
ClientHandle->SendWindowClose(m_WindowID);
}
{
@@ -349,10 +338,9 @@ void cWindow::Destroy()
void cWindow::SendWholeWindow( cClientHandle* a_Client )
void cWindow::SendWholeWindow(cClientHandle * a_Client )
{
cPacket_WholeInventory Inventory( this );
a_Client->Send( Inventory );
a_Client->SendWholeInventory(*this);
}