flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Source files cleanup: UI files renamed

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@878 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2012-09-23 17:19:34 +00:00
parent a3b7dbb13d
commit f58c3f2e81
15 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
VC2008/MCServer.vcproj
View File

@ -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"

2
source/Protocol125.cpp
View File

@ -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"

2
source/Protocol132.cpp
View File

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

2
source/UI/SlotArea.cpp
View File

@ -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"

7
source/UI/cWindow.cpp → source/UI/Window.cpp
View File

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

2
source/UI/cWindow.h → source/UI/Window.h
View File

@ -1,5 +1,5 @@
// cWindow.h
// Window.h
// Interfaces to the cWindow class representing a UI window for a specific block

2
source/UI/cWindowOwner.h → source/UI/WindowOwner.h
View File

@ -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

2
source/blocks/BlockWorkbench.h
View File

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

2
source/cChestEntity.cpp
View File

@ -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"

2
source/cChestEntity.h
View File

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

4
source/cClientHandle.cpp
View File

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

2
source/cFurnaceEntity.cpp
View File

@ -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"

2
source/cFurnaceEntity.h
View File

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

2
source/cInventory.cpp
View File

@ -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"

4
source/cPlayer.cpp
View File

@ -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"