diff options
author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-09-23 19:19:34 +0200 |
---|---|---|
committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-09-23 19:19:34 +0200 |
commit | f58c3f2e81e5cef689cf4b60a2616d062ee8edf6 (patch) | |
tree | 5ac538e5995f4f70aec73b77a220d4696651132a /source/UI | |
parent | Fixed position confirming for 1.3.2 (FS #245) (diff) | |
download | cuberite-f58c3f2e81e5cef689cf4b60a2616d062ee8edf6.tar cuberite-f58c3f2e81e5cef689cf4b60a2616d062ee8edf6.tar.gz cuberite-f58c3f2e81e5cef689cf4b60a2616d062ee8edf6.tar.bz2 cuberite-f58c3f2e81e5cef689cf4b60a2616d062ee8edf6.tar.lz cuberite-f58c3f2e81e5cef689cf4b60a2616d062ee8edf6.tar.xz cuberite-f58c3f2e81e5cef689cf4b60a2616d062ee8edf6.tar.zst cuberite-f58c3f2e81e5cef689cf4b60a2616d062ee8edf6.zip |
Diffstat (limited to '')
-rw-r--r-- | source/UI/SlotArea.cpp | 2 | ||||
-rw-r--r-- | source/UI/Window.cpp (renamed from source/UI/cWindow.cpp) | 7 | ||||
-rw-r--r-- | source/UI/Window.h (renamed from source/UI/cWindow.h) | 2 | ||||
-rw-r--r-- | source/UI/WindowOwner.h (renamed from source/UI/cWindowOwner.h) | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/source/UI/SlotArea.cpp b/source/UI/SlotArea.cpp index 6da0a15b8..655f85524 100644 --- a/source/UI/SlotArea.cpp +++ b/source/UI/SlotArea.cpp @@ -9,7 +9,7 @@ #include "../cChestEntity.h"
#include "../cFurnaceEntity.h"
#include "../Items/Item.h"
-#include "cWindow.h"
+#include "Window.h"
#include "../CraftingRecipes.h"
#include "../cRoot.h"
diff --git a/source/UI/cWindow.cpp b/source/UI/Window.cpp index bd6724751..e6c7a9feb 100644 --- a/source/UI/cWindow.cpp +++ b/source/UI/Window.cpp @@ -1,13 +1,13 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "cWindow.h" +#include "Window.h" #include "../cItem.h" #include "../cClientHandle.h" #include "../cPlayer.h" #include "../cPickup.h" #include "../cInventory.h" -#include "cWindowOwner.h" +#include "WindowOwner.h" #include "../items/Item.h" #include "SlotArea.h" #include "../cChestEntity.h" @@ -94,8 +94,6 @@ void cWindow::Clicked( const cItem & a_ClickedItem ) { - LOGD("cWindow::Clicked(): ID %d (exp %d), SlotNum %d", a_WindowID, m_WindowID, a_SlotNum); - if (a_WindowID != m_WindowID) { LOG("WRONG WINDOW ID! (exp %d, got %d) received from \"%s\"", m_WindowID, a_WindowID, a_Player.GetName().c_str()); @@ -121,7 +119,6 @@ void cWindow::Clicked( { if (LocalSlotNum < (*itr)->GetNumSlots()) { - LOGD("SlotArea #%d (%d slots) handling the click", idx, (*itr)->GetNumSlots()); (*itr)->Clicked(a_Player, LocalSlotNum, a_IsRightClick, a_IsShiftPressed, a_ClickedItem); return; } diff --git a/source/UI/cWindow.h b/source/UI/Window.h index 0fc368c9c..b3df1bc86 100644 --- a/source/UI/cWindow.h +++ b/source/UI/Window.h @@ -1,5 +1,5 @@ -// cWindow.h +// Window.h // Interfaces to the cWindow class representing a UI window for a specific block diff --git a/source/UI/cWindowOwner.h b/source/UI/WindowOwner.h index 1ce03ed30..e0cc8da8a 100644 --- a/source/UI/cWindowOwner.h +++ b/source/UI/WindowOwner.h @@ -3,7 +3,7 @@ #include "../cBlockEntity.h" #include "../cEntity.h" -#include "cWindow.h" +#include "Window.h" /* Being a descendant of cWindowOwner means that the class can own one window. That window can be |