15 files changed, 22 insertions, 25 deletions

diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj
index 6e0495b31..95ae8b2ea 100644
--- a/VC2008/MCServer.vcproj
+++ b/VC2008/MCServer.vcproj
@@ -1048,23 +1048,23 @@
 				Name="UI"

 				>

 				<File

-					RelativePath="..\source\UI\cWindow.cpp"

+					RelativePath="..\source\UI\SlotArea.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\UI\cWindow.h"

+					RelativePath="..\source\UI\SlotArea.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\UI\cWindowOwner.h"

+					RelativePath="..\source\UI\Window.cpp"

 					>

 				</File>

 				<File

-					RelativePath="..\source\UI\SlotArea.cpp"

+					RelativePath="..\source\UI\Window.h"

 					>

 				</File>

 				<File

-					RelativePath="..\source\UI\SlotArea.h"

+					RelativePath="..\source\UI\WindowOwner.h"

 					>

 				</File>

 			</Filter>

diff --git a/source/Protocol125.cpp b/source/Protocol125.cpp
index 09e422c48..27b559ee1 100644
--- a/source/Protocol125.cpp
+++ b/source/Protocol125.cpp
@@ -20,7 +20,7 @@ Documentation:
 #include "cPickup.h"

 #include "cPlayer.h"

 #include "cChatColor.h"

-#include "UI/cWindow.h"

+#include "UI/Window.h"

 #include "cRoot.h"

 #include "cServer.h"

 

diff --git a/source/Protocol132.cpp b/source/Protocol132.cpp
index 48ecff0b2..b34ff485a 100644
--- a/source/Protocol132.cpp
+++ b/source/Protocol132.cpp
@@ -13,7 +13,7 @@
 #include "ChunkDataSerializer.h"

 #include "cPlayer.h"

 #include "cMonster.h"

-#include "UI/cWindow.h"

+#include "UI/Window.h"

 

 

 

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 
diff --git a/source/blocks/BlockWorkbench.h b/source/blocks/BlockWorkbench.h
index 998e07d9b..776628382 100644
--- a/source/blocks/BlockWorkbench.h
+++ b/source/blocks/BlockWorkbench.h
@@ -1,6 +1,6 @@
 #pragma once

 #include "Block.h"

-#include "../UI/cWindow.h"

+#include "../UI/Window.h"

 #include "../cPlayer.h"

 

 

diff --git a/source/cChestEntity.cpp b/source/cChestEntity.cpp
index 8914f5f41..659bd7083 100644
--- a/source/cChestEntity.cpp
+++ b/source/cChestEntity.cpp
@@ -5,7 +5,7 @@
 #include "cItem.h"
 #include "cClientHandle.h"
 #include "cPlayer.h"
-#include "UI/cWindow.h"
+#include "UI/Window.h"
 #include "cWorld.h"
 #include "cRoot.h"
 #include "cPickup.h"
diff --git a/source/cChestEntity.h b/source/cChestEntity.h
index 962e9f86d..2f6301479 100644
--- a/source/cChestEntity.h
+++ b/source/cChestEntity.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include "cBlockEntity.h"
-#include "UI/cWindowOwner.h"
+#include "UI/WindowOwner.h"
 
 
 
diff --git a/source/cClientHandle.cpp b/source/cClientHandle.cpp
index 5802fc1d1..5aa06eb36 100644
--- a/source/cClientHandle.cpp
+++ b/source/cClientHandle.cpp
@@ -10,7 +10,7 @@
 #include "cInventory.h"
 #include "cChestEntity.h"
 #include "cSignEntity.h"
-#include "UI/cWindow.h"
+#include "UI/Window.h"
 #include "cItem.h"
 #include "cTorch.h"
 #include "cDoors.h"
@@ -1067,7 +1067,7 @@ void cClientHandle::Tick(float a_Dt)
 
 void cClientHandle::SendDisconnect(const AString & a_Reason)
 {
-	LOGD("Sending a DC");
+	LOGD("Sending a DC: \"%s\"", a_Reason.c_str());
 	m_Protocol->SendDisconnect(a_Reason);
 }
 
diff --git a/source/cFurnaceEntity.cpp b/source/cFurnaceEntity.cpp
index 7ad088586..07df83452 100644
--- a/source/cFurnaceEntity.cpp
+++ b/source/cFurnaceEntity.cpp
@@ -4,7 +4,7 @@
 #include "cFurnaceEntity.h"
 #include "BlockID.h"
 #include "cItem.h"
-#include "UI/cWindow.h"
+#include "UI/Window.h"
 #include "cPlayer.h"
 #include "cWorld.h"
 #include "cClientHandle.h"
diff --git a/source/cFurnaceEntity.h b/source/cFurnaceEntity.h
index 43bf615a6..60aec47af 100644
--- a/source/cFurnaceEntity.h
+++ b/source/cFurnaceEntity.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include "cBlockEntity.h"
-#include "UI/cWindowOwner.h"
+#include "UI/WindowOwner.h"
 #include "cItem.h"
 
 
diff --git a/source/cInventory.cpp b/source/cInventory.cpp
index 1e0b4f6ae..41d4c14fa 100644
--- a/source/cInventory.cpp
+++ b/source/cInventory.cpp
@@ -4,7 +4,7 @@
 #include "cInventory.h"
 #include "cPlayer.h"
 #include "cClientHandle.h"
-#include "UI/cWindow.h"
+#include "UI/Window.h"
 #include "cItem.h"
 #include "cRoot.h"
 
diff --git a/source/cPlayer.cpp b/source/cPlayer.cpp
index e0d1eef6e..65132296f 100644
--- a/source/cPlayer.cpp
+++ b/source/cPlayer.cpp
@@ -4,8 +4,8 @@
 #include "cPlayer.h"
 #include "cServer.h"
 #include "cClientHandle.h"
-#include "UI/cWindow.h"
-#include "UI/cWindowOwner.h"
+#include "UI/Window.h"
+#include "UI/WindowOwner.h"
 #include "cWorld.h"
 #include "cPickup.h"
 #include "cPluginManager.h"