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.h | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) (limited to 'source/packets/cPacket_WindowClick.h') diff --git a/source/packets/cPacket_WindowClick.h b/source/packets/cPacket_WindowClick.h index 72ebad2a1..e0f6f964e 100644 --- a/source/packets/cPacket_WindowClick.h +++ b/source/packets/cPacket_WindowClick.h @@ -2,6 +2,7 @@ #pragma once #include "cPacket.h" +#include "../cItem.h" @@ -13,36 +14,24 @@ public: cPacket_WindowClick() : m_WindowID( 0 ) , m_SlotNum( 0 ) - , m_RightMouse( 0 ) - , m_NumClicks( 0 ) + , m_IsRightClick(false) + , m_TransactionID( 0 ) , m_IsShiftPressed( false ) - , m_ItemID( 0 ) - , m_ItemCount( 0 ) - , m_ItemUses( 0 ) - , m_EnchantNums(-1) - { m_PacketID = E_WINDOW_CLICK; } + { + m_PacketID = E_WINDOW_CLICK; + } + virtual cPacket* Clone() const { return new cPacket_WindowClick(*this); } virtual int Parse(cByteBuffer & a_Buffer) override; char m_WindowID; - short m_SlotNum; // Slot - // 0 = craft result - // 1-4 = crafting table - // 5-8 = armor - // 9-35 = inventory - // 36-44 = Hot bar - - char m_RightMouse; // 0 = Left 1 = Right mb - short m_NumClicks; // Num clicks + short m_SlotNum; + bool m_IsRightClick; + short m_TransactionID; bool m_IsShiftPressed; // Shift pressed when clicked? - // Below = item - short m_ItemID; // if this is -1 the next stuff dont exist - char m_ItemCount; - short m_ItemUses; - - short m_EnchantNums; + cItem m_HeldItem; }; -- cgit v1.2.3