From 2691e8daed826e944ca38f4787c77273edbf9404 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sat, 18 Aug 2012 09:56:28 +0000 Subject: Packet refactoring, phase two, partial. Rewritten a few packet handling functions not to use cPacket-descendant objects. This breaks plugin API! Plugins need to modify their hook functions to match those used in the Core plugin git-svn-id: http://mc-server.googlecode.com/svn/trunk@750 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/packets/cPacket_WindowClick.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'source/packets/cPacket_WindowClick.cpp') diff --git a/source/packets/cPacket_WindowClick.cpp b/source/packets/cPacket_WindowClick.cpp index c250c187e..1d4304917 100644 --- a/source/packets/cPacket_WindowClick.cpp +++ b/source/packets/cPacket_WindowClick.cpp @@ -14,11 +14,11 @@ int cPacket_WindowClick::Parse(cByteBuffer & a_Buffer) int TotalBytes = 0; HANDLE_PACKET_READ(ReadChar, m_WindowID, TotalBytes); HANDLE_PACKET_READ(ReadBEShort, m_SlotNum, TotalBytes); - HANDLE_PACKET_READ(ReadChar, m_RightMouse, TotalBytes); - HANDLE_PACKET_READ(ReadBEShort, m_NumClicks, TotalBytes); + HANDLE_PACKET_READ(ReadBool, m_IsRightClick, TotalBytes); + HANDLE_PACKET_READ(ReadBEShort, m_TransactionID, TotalBytes); HANDLE_PACKET_READ(ReadBool, m_IsShiftPressed, TotalBytes); - cPacket_ItemData Item; + cPacket_ItemData Item(m_HeldItem); int res = Item.Parse(a_Buffer); if (res < 0) { @@ -26,12 +26,6 @@ int cPacket_WindowClick::Parse(cByteBuffer & a_Buffer) } TotalBytes += res; - m_ItemID = Item.m_ItemID; - m_ItemCount = Item.m_ItemCount; - m_ItemUses = Item.m_ItemUses; - - m_EnchantNums = Item.m_EnchantNums; - return TotalBytes; } -- cgit v1.2.3