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/cFurnaceWindow.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'source/cFurnaceWindow.cpp') diff --git a/source/cFurnaceWindow.cpp b/source/cFurnaceWindow.cpp index 8dcd0c8a5..480eaee1c 100644 --- a/source/cFurnaceWindow.cpp +++ b/source/cFurnaceWindow.cpp @@ -22,21 +22,27 @@ cFurnaceWindow::cFurnaceWindow( cFurnaceEntity* a_Owner ) -void cFurnaceWindow::Clicked(cPacket_WindowClick * a_ClickPacket, cPlayer & a_Player) +void cFurnaceWindow::Clicked( + cPlayer & a_Player, + int a_WindowID, short a_SlotNum, bool a_IsRightClick, bool a_IsShiftPressed, + const cItem & a_HeldItem +) { cItem Fuel = *GetSlot( 0 ); - cWindow::Clicked( a_ClickPacket, a_Player ); + cWindow::Clicked(a_Player, a_WindowID, a_SlotNum, a_IsRightClick, a_IsShiftPressed, a_HeldItem); if (m_Furnace != NULL) { - if ((a_ClickPacket->m_SlotNum >= 0) && (a_ClickPacket->m_SlotNum <= 2)) // them important slots + if ((a_SlotNum >= 0) && (a_SlotNum <= 2)) // them important slots { - if( Fuel.m_ItemID != GetSlot( 0 )->m_ItemID ) + if (Fuel.m_ItemID != GetSlot( 0 )->m_ItemID) + { m_Furnace->ResetCookTimer(); + } - if( m_Furnace->StartCooking() ) + if (m_Furnace->StartCooking()) { - SendWholeWindow( a_Player.GetClientHandle() ); + SendWholeWindow(a_Player.GetClientHandle()); } } } -- cgit v1.2.3