Source files cleanup: UI files renamed

git-svn-id: http://mc-server.googlecode.com/svn/trunk@878 0a769ca7-a7f5-676a-18bf-c427514a06d6

VC2008/MCServer.vcproj

@@ -1047,18 +1047,6 @@
 			<Filter
 				Name="UI"
 				>
-				<File
-					RelativePath="..\source\UI\cWindow.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\source\UI\cWindow.h"
-					>
-				</File>
-				<File
-					RelativePath="..\source\UI\cWindowOwner.h"
-					>
-				</File>
 				<File
 					RelativePath="..\source\UI\SlotArea.cpp"
 					>
@@ -1067,6 +1055,18 @@
 					RelativePath="..\source\UI\SlotArea.h"
 					>
 				</File>
+				<File
+					RelativePath="..\source\UI\Window.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\source\UI\Window.h"
+					>
+				</File>
+				<File
+					RelativePath="..\source\UI\WindowOwner.h"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="Physics"

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"
 

source/Protocol132.cpp

@@ -13,7 +13,7 @@
 #include "ChunkDataSerializer.h"
 #include "cPlayer.h"
 #include "cMonster.h"
-#include "UI/cWindow.h"
+#include "UI/Window.h"
 
 
 

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"
 

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;
 		}

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
 

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 

source/blocks/BlockWorkbench.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "Block.h"
-#include "../UI/cWindow.h"
+#include "../UI/Window.h"
 #include "../cPlayer.h"
 
 

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"

source/cChestEntity.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "cBlockEntity.h"
-#include "UI/cWindowOwner.h"
+#include "UI/WindowOwner.h"
 
 
 

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);
 }
 

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"

source/cFurnaceEntity.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "cBlockEntity.h"
-#include "UI/cWindowOwner.h"
+#include "UI/WindowOwner.h"
 #include "cItem.h"
 
 

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"
 

source/cPlayer.cpp

@@ -4,8 +4,8 @@
 #include "cPlayer.h"
 #include "cServer.h"
 #include "cClientHandle.h"
-#include "UI/cWindow.h"
+#include "UI/Window.h"
-#include "UI/cWindowOwner.h"
+#include "UI/WindowOwner.h"
 #include "cWorld.h"
 #include "cPickup.h"
 #include "cPluginManager.h"