summaryrefslogtreecommitdiffstats
path: root/source/UI
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-05-28 21:12:47 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-05-28 21:12:47 +0200
commit9be27992e211631cb4e72619c78c5c23397b2a9c (patch)
treed981f1123709c10db9cf3432ccbb793285226f2e /source/UI
parentBlock entities now receive the cChunk param in their Tick() function (diff)
downloadcuberite-9be27992e211631cb4e72619c78c5c23397b2a9c.tar
cuberite-9be27992e211631cb4e72619c78c5c23397b2a9c.tar.gz
cuberite-9be27992e211631cb4e72619c78c5c23397b2a9c.tar.bz2
cuberite-9be27992e211631cb4e72619c78c5c23397b2a9c.tar.lz
cuberite-9be27992e211631cb4e72619c78c5c23397b2a9c.tar.xz
cuberite-9be27992e211631cb4e72619c78c5c23397b2a9c.tar.zst
cuberite-9be27992e211631cb4e72619c78c5c23397b2a9c.zip
Diffstat (limited to '')
-rw-r--r--source/UI/SlotArea.cpp6
-rw-r--r--source/UI/Window.cpp6
-rw-r--r--source/UI/WindowOwner.h2
3 files changed, 7 insertions, 7 deletions
diff --git a/source/UI/SlotArea.cpp b/source/UI/SlotArea.cpp
index abe964454..1886c515c 100644
--- a/source/UI/SlotArea.cpp
+++ b/source/UI/SlotArea.cpp
@@ -6,9 +6,9 @@
#include "Globals.h"
#include "SlotArea.h"
#include "../Player.h"
-#include "../ChestEntity.h"
-#include "../DropSpenserEntity.h"
-#include "../FurnaceEntity.h"
+#include "../BlockEntities/ChestEntity.h"
+#include "../BlockEntities/DropSpenserEntity.h"
+#include "../BlockEntities/FurnaceEntity.h"
#include "../Items/ItemHandler.h"
#include "Window.h"
#include "../CraftingRecipes.h"
diff --git a/source/UI/Window.cpp b/source/UI/Window.cpp
index b21c2adba..c2ce4127e 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 "WindowOwner.h"
+#include "SlotArea.h"
#include "../Item.h"
#include "../ClientHandle.h"
#include "../Player.h"
#include "../Pickup.h"
#include "../Inventory.h"
-#include "WindowOwner.h"
#include "../Items/ItemHandler.h"
-#include "SlotArea.h"
-#include "../ChestEntity.h"
+#include "../BlockEntities/ChestEntity.h"
diff --git a/source/UI/WindowOwner.h b/source/UI/WindowOwner.h
index 82293b357..b7cbadf01 100644
--- a/source/UI/WindowOwner.h
+++ b/source/UI/WindowOwner.h
@@ -1,7 +1,7 @@
#pragma once
-#include "../BlockEntity.h"
+#include "../BlockEntities/BlockEntity.h"
#include "../Entity.h"
#include "Window.h"