From 5c3235ecdc3f718ce20e006f1ecfa2159df82c87 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sun, 26 May 2013 14:39:04 +0000 Subject: Implemented droppers Added a common ancestor class "DropSpenser" that has the common code for dropper and dispenser and is Lua-accessible, too. The Debuggers plugin now triggers both droppers and dispensers when rclking them with a redstone torch. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1514 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/UI/SlotArea.cpp | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) (limited to 'source/UI/SlotArea.cpp') diff --git a/source/UI/SlotArea.cpp b/source/UI/SlotArea.cpp index 07b191292..abe964454 100644 --- a/source/UI/SlotArea.cpp +++ b/source/UI/SlotArea.cpp @@ -7,7 +7,7 @@ #include "SlotArea.h" #include "../Player.h" #include "../ChestEntity.h" -#include "../DispenserEntity.h" +#include "../DropSpenserEntity.h" #include "../FurnaceEntity.h" #include "../Items/ItemHandler.h" #include "Window.h" @@ -474,11 +474,11 @@ cCraftingRecipe & cSlotAreaCrafting::GetRecipeForPlayer(cPlayer & a_Player) /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -// cSlotAreaFurnace: +// cSlotAreaDropSpenser: -cSlotAreaDispenser::cSlotAreaDispenser(cDispenserEntity * a_Dispenser, cWindow & a_ParentWindow) : +cSlotAreaDropSpenser::cSlotAreaDropSpenser(cDropSpenserEntity * a_DropSpenser, cWindow & a_ParentWindow) : cSlotArea(9, a_ParentWindow), - m_Dispenser(a_Dispenser) + m_DropSpenser(a_DropSpenser) { } @@ -486,34 +486,18 @@ cSlotAreaDispenser::cSlotAreaDispenser(cDispenserEntity * a_Dispenser, cWindow & -void cSlotAreaDispenser::Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) -{ - super::Clicked(a_Player, a_SlotNum, a_ClickAction, a_ClickedItem); - - if (m_Dispenser == NULL) - { - LOGERROR("cSlotAreaDispenser::Clicked(): m_Dispenser == NULL"); - ASSERT(!"cSlotAreaDispenser::Clicked(): m_Dispenser == NULL"); - return; - } -} - - - - - -const cItem * cSlotAreaDispenser::GetSlot(int a_SlotNum, cPlayer & a_Player) +const cItem * cSlotAreaDropSpenser::GetSlot(int a_SlotNum, cPlayer & a_Player) { - return &(m_Dispenser->GetSlot(a_SlotNum)); + return &(m_DropSpenser->GetSlot(a_SlotNum)); } -void cSlotAreaDispenser::SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) +void cSlotAreaDropSpenser::SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) { - m_Dispenser->SetSlot(a_SlotNum, a_Item); + m_DropSpenser->SetSlot(a_SlotNum, a_Item); } -- cgit v1.2.3