diff options
| author | Mattes D <github@xoft.cz> | 2015-03-11 14:26:04 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2015-03-11 14:26:04 +0100 |
| commit | 1b60fe12a859287d1fc9f923fb2c85e30e7f9ad0 (patch) | |
| tree | 961b0a521e31ba4f0a1b3516b49173c723ae24bd /src/BlockEntities | |
| parent | Merge pull request #1805 from mc-server/chunkDataFix (diff) | |
| parent | Moved window code into cpp files (diff) | |
| download | cuberite-1b60fe12a859287d1fc9f923fb2c85e30e7f9ad0.tar cuberite-1b60fe12a859287d1fc9f923fb2c85e30e7f9ad0.tar.gz cuberite-1b60fe12a859287d1fc9f923fb2c85e30e7f9ad0.tar.bz2 cuberite-1b60fe12a859287d1fc9f923fb2c85e30e7f9ad0.tar.lz cuberite-1b60fe12a859287d1fc9f923fb2c85e30e7f9ad0.tar.xz cuberite-1b60fe12a859287d1fc9f923fb2c85e30e7f9ad0.tar.zst cuberite-1b60fe12a859287d1fc9f923fb2c85e30e7f9ad0.zip | |
Diffstat (limited to 'src/BlockEntities')
| -rw-r--r-- | src/BlockEntities/BeaconEntity.cpp | 3 | ||||
| -rw-r--r-- | src/BlockEntities/ChestEntity.cpp | 2 | ||||
| -rw-r--r-- | src/BlockEntities/DropSpenserEntity.cpp | 1 | ||||
| -rw-r--r-- | src/BlockEntities/EnderChestEntity.cpp | 2 | ||||
| -rw-r--r-- | src/BlockEntities/FurnaceEntity.cpp | 2 | ||||
| -rw-r--r-- | src/BlockEntities/HopperEntity.cpp | 1 |
6 files changed, 7 insertions, 4 deletions
diff --git a/src/BlockEntities/BeaconEntity.cpp b/src/BlockEntities/BeaconEntity.cpp index 37ce7a8ab..fb3940ce9 100644 --- a/src/BlockEntities/BeaconEntity.cpp +++ b/src/BlockEntities/BeaconEntity.cpp @@ -4,6 +4,7 @@ #include "BeaconEntity.h" #include "../BlockArea.h" #include "../Entities/Player.h" +#include "../UI/BeaconWindow.h" @@ -289,7 +290,7 @@ void cBeaconEntity::UsedBy(cPlayer * a_Player) OpenWindow(new cBeaconWindow(m_PosX, m_PosY, m_PosZ, this)); Window = GetWindow(); } - + if (Window != nullptr) { // if (a_Player->GetWindow() != Window) diff --git a/src/BlockEntities/ChestEntity.cpp b/src/BlockEntities/ChestEntity.cpp index 0cd9c66e0..3821f9aab 100644 --- a/src/BlockEntities/ChestEntity.cpp +++ b/src/BlockEntities/ChestEntity.cpp @@ -4,7 +4,7 @@ #include "ChestEntity.h" #include "../Item.h" #include "../Entities/Player.h" -#include "../UI/Window.h" +#include "../UI/ChestWindow.h" diff --git a/src/BlockEntities/DropSpenserEntity.cpp b/src/BlockEntities/DropSpenserEntity.cpp index 5e98506f1..039f5d360 100644 --- a/src/BlockEntities/DropSpenserEntity.cpp +++ b/src/BlockEntities/DropSpenserEntity.cpp @@ -8,6 +8,7 @@ #include "DropSpenserEntity.h" #include "../Entities/Player.h" #include "../Chunk.h" +#include "../UI/DropSpenserWindow.h" diff --git a/src/BlockEntities/EnderChestEntity.cpp b/src/BlockEntities/EnderChestEntity.cpp index e18490a1e..ab5c5a2de 100644 --- a/src/BlockEntities/EnderChestEntity.cpp +++ b/src/BlockEntities/EnderChestEntity.cpp @@ -4,7 +4,7 @@ #include "EnderChestEntity.h" #include "../Item.h" #include "../Entities/Player.h" -#include "../UI/Window.h" +#include "../UI/EnderChestWindow.h" diff --git a/src/BlockEntities/FurnaceEntity.cpp b/src/BlockEntities/FurnaceEntity.cpp index cc5a00af7..2621b560b 100644 --- a/src/BlockEntities/FurnaceEntity.cpp +++ b/src/BlockEntities/FurnaceEntity.cpp @@ -2,7 +2,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "FurnaceEntity.h" -#include "../UI/Window.h" +#include "../UI/FurnaceWindow.h" #include "../Entities/Player.h" #include "../Root.h" #include "../Chunk.h" diff --git a/src/BlockEntities/HopperEntity.cpp b/src/BlockEntities/HopperEntity.cpp index c2d6cabbb..bfd4b8322 100644 --- a/src/BlockEntities/HopperEntity.cpp +++ b/src/BlockEntities/HopperEntity.cpp @@ -9,6 +9,7 @@ #include "../Entities/Player.h" #include "../Entities/Pickup.h" #include "../Bindings/PluginManager.h" +#include "../UI/HopperWindow.h" #include "ChestEntity.h" #include "FurnaceEntity.h" |