diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-09-24 00:09:57 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-09-24 00:09:57 +0200 |
| commit | ecfe6ab65bd1fc2c7f5733fe6ef4e6ddaac44a26 (patch) | |
| tree | 898e37fe747f0fdcefeb88f833557fd45db3347c /source/UI | |
| parent | Source files cleanup: ChunkDataSerializer is Protocol-related (diff) | |
| download | cuberite-ecfe6ab65bd1fc2c7f5733fe6ef4e6ddaac44a26.tar cuberite-ecfe6ab65bd1fc2c7f5733fe6ef4e6ddaac44a26.tar.gz cuberite-ecfe6ab65bd1fc2c7f5733fe6ef4e6ddaac44a26.tar.bz2 cuberite-ecfe6ab65bd1fc2c7f5733fe6ef4e6ddaac44a26.tar.lz cuberite-ecfe6ab65bd1fc2c7f5733fe6ef4e6ddaac44a26.tar.xz cuberite-ecfe6ab65bd1fc2c7f5733fe6ef4e6ddaac44a26.tar.zst cuberite-ecfe6ab65bd1fc2c7f5733fe6ef4e6ddaac44a26.zip | |
Diffstat (limited to 'source/UI')
| -rw-r--r-- | source/UI/SlotArea.cpp | 10 | ||||
| -rw-r--r-- | source/UI/SlotArea.h | 2 | ||||
| -rw-r--r-- | source/UI/Window.cpp | 14 | ||||
| -rw-r--r-- | source/UI/Window.h | 2 | ||||
| -rw-r--r-- | source/UI/WindowOwner.h | 4 |
5 files changed, 16 insertions, 16 deletions
diff --git a/source/UI/SlotArea.cpp b/source/UI/SlotArea.cpp index 655f85524..73d26eb27 100644 --- a/source/UI/SlotArea.cpp +++ b/source/UI/SlotArea.cpp @@ -5,13 +5,13 @@ #include "Globals.h"
#include "SlotArea.h"
-#include "../cPlayer.h"
-#include "../cChestEntity.h"
-#include "../cFurnaceEntity.h"
-#include "../Items/Item.h"
+#include "../Player.h"
+#include "../ChestEntity.h"
+#include "../FurnaceEntity.h"
+#include "../Items/ItemHandler.h"
#include "Window.h"
#include "../CraftingRecipes.h"
-#include "../cRoot.h"
+#include "../Root.h"
diff --git a/source/UI/SlotArea.h b/source/UI/SlotArea.h index 79f95c5d5..e356fbdd8 100644 --- a/source/UI/SlotArea.h +++ b/source/UI/SlotArea.h @@ -8,7 +8,7 @@ #pragma once
-#include "../cItem.h"
+#include "../Item.h"
diff --git a/source/UI/Window.cpp b/source/UI/Window.cpp index e6c7a9feb..b3d72570c 100644 --- a/source/UI/Window.cpp +++ b/source/UI/Window.cpp @@ -2,15 +2,15 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Window.h" -#include "../cItem.h" -#include "../cClientHandle.h" -#include "../cPlayer.h" -#include "../cPickup.h" -#include "../cInventory.h" +#include "../Item.h" +#include "../ClientHandle.h" +#include "../Player.h" +#include "../Pickup.h" +#include "../Inventory.h" #include "WindowOwner.h" -#include "../items/Item.h" +#include "../items/ItemHandler.h" #include "SlotArea.h" -#include "../cChestEntity.h" +#include "../ChestEntity.h" diff --git a/source/UI/Window.h b/source/UI/Window.h index b3df1bc86..8caab3bd1 100644 --- a/source/UI/Window.h +++ b/source/UI/Window.h @@ -9,7 +9,7 @@ #pragma once -#include "../cItem.h" +#include "../Item.h" diff --git a/source/UI/WindowOwner.h b/source/UI/WindowOwner.h index e0cc8da8a..7ad4a5739 100644 --- a/source/UI/WindowOwner.h +++ b/source/UI/WindowOwner.h @@ -1,8 +1,8 @@ #pragma once -#include "../cBlockEntity.h" -#include "../cEntity.h" +#include "../BlockEntity.h" +#include "../Entity.h" #include "Window.h" /* |