From ee8419701472be9f24c51a41ee7b7ef3cf38f329 Mon Sep 17 00:00:00 2001
From: peterbell10 <peterbell10@live.co.uk>
Date: Wed, 29 Aug 2018 01:51:25 +0100
Subject: Force all headers other than "Globals.h" to be included with relative
 paths (#4269)

Closes #4236

CMake now creates a header file in the build directory under the path "include/Globals.h" which just includes "src/Globals.h" with an absolute path. Then instead of adding "src/" to the include directories, it adds "include/".

#include "Globals.h" still works by including the build generated file and any other src-relative path will not work.
---
 src/Blocks/BlockBed.cpp            | 2 +-
 src/Blocks/BlockButton.h           | 2 +-
 src/Blocks/BlockDirt.h             | 4 ++--
 src/Blocks/BlockDoor.h             | 2 +-
 src/Blocks/BlockFence.h            | 4 ++--
 src/Blocks/BlockPiston.cpp         | 2 +-
 src/Blocks/BlockRedstoneRepeater.h | 2 +-
 src/Blocks/BlockSignPost.h         | 2 +-
 src/Blocks/BlockWallSign.h         | 2 +-
 src/Blocks/BroadcastInterface.h    | 4 ++--
 src/Blocks/ChunkInterface.cpp      | 2 +-
 src/Blocks/WorldInterface.h        | 3 ++-
 12 files changed, 16 insertions(+), 15 deletions(-)

(limited to 'src/Blocks')

diff --git a/src/Blocks/BlockBed.cpp b/src/Blocks/BlockBed.cpp
index aa816b046..6a5a9ec02 100644
--- a/src/Blocks/BlockBed.cpp
+++ b/src/Blocks/BlockBed.cpp
@@ -5,7 +5,7 @@
 #include "BlockBed.h"
 
 #include "BroadcastInterface.h"
-#include "Entities/Player.h"
+#include "../Entities/Player.h"
 #include "../World.h"
 #include "../BoundingBox.h"
 #include "../Mobs/Monster.h"
diff --git a/src/Blocks/BlockButton.h b/src/Blocks/BlockButton.h
index ed4e12482..f81220b36 100644
--- a/src/Blocks/BlockButton.h
+++ b/src/Blocks/BlockButton.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "BlockHandler.h"
-#include "Chunk.h"
+#include "../Chunk.h"
 #include "MetaRotator.h"
 
 
diff --git a/src/Blocks/BlockDirt.h b/src/Blocks/BlockDirt.h
index 99149e5b1..43cadf767 100644
--- a/src/Blocks/BlockDirt.h
+++ b/src/Blocks/BlockDirt.h
@@ -3,8 +3,8 @@
 
 #include "BlockHandler.h"
 #include "../FastRandom.h"
-#include "Root.h"
-#include "Bindings/PluginManager.h"
+#include "../Root.h"
+#include "../Bindings/PluginManager.h"
 
 
 
diff --git a/src/Blocks/BlockDoor.h b/src/Blocks/BlockDoor.h
index 7413b180a..04d63141d 100644
--- a/src/Blocks/BlockDoor.h
+++ b/src/Blocks/BlockDoor.h
@@ -3,7 +3,7 @@
 
 #include "BlockHandler.h"
 #include "../Entities/Player.h"
-#include "Chunk.h"
+#include "../Chunk.h"
 #include "MetaRotator.h"
 #include "ChunkInterface.h"
 #include "BlockSlab.h"
diff --git a/src/Blocks/BlockFence.h b/src/Blocks/BlockFence.h
index 1cccaa710..7714cb036 100644
--- a/src/Blocks/BlockFence.h
+++ b/src/Blocks/BlockFence.h
@@ -4,8 +4,8 @@
 #include "BlockHandler.h"
 #include "../BoundingBox.h"
 #include "../EffectID.h"
-#include "Entities/LeashKnot.h"
-#include "BoundingBox.h"
+#include "../Entities/LeashKnot.h"
+#include "../BoundingBox.h"
 #include "../Mobs/PassiveMonster.h"
 
 
diff --git a/src/Blocks/BlockPiston.cpp b/src/Blocks/BlockPiston.cpp
index 3fa421141..c3a90c8a5 100644
--- a/src/Blocks/BlockPiston.cpp
+++ b/src/Blocks/BlockPiston.cpp
@@ -4,7 +4,7 @@
 #include "../Item.h"
 #include "../World.h"
 #include "../Entities/Player.h"
-#include "BlockInServerPluginInterface.h"
+#include "../BlockInServerPluginInterface.h"
 #include "ChunkInterface.h"
 
 
diff --git a/src/Blocks/BlockRedstoneRepeater.h b/src/Blocks/BlockRedstoneRepeater.h
index e42f63c3b..455ef1171 100644
--- a/src/Blocks/BlockRedstoneRepeater.h
+++ b/src/Blocks/BlockRedstoneRepeater.h
@@ -2,10 +2,10 @@
 #pragma once
 
 #include "BlockHandler.h"
-#include "Chunk.h"
 #include "MetaRotator.h"
 #include "ChunkInterface.h"
 #include "BlockSlab.h"
+#include "../Chunk.h"
 
 
 
diff --git a/src/Blocks/BlockSignPost.h b/src/Blocks/BlockSignPost.h
index 4af50ad5b..fe170a675 100644
--- a/src/Blocks/BlockSignPost.h
+++ b/src/Blocks/BlockSignPost.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include "BlockHandler.h"
-#include "Chunk.h"
+#include "../Chunk.h"
 
 
 
diff --git a/src/Blocks/BlockWallSign.h b/src/Blocks/BlockWallSign.h
index c824bda11..37ca2afae 100644
--- a/src/Blocks/BlockWallSign.h
+++ b/src/Blocks/BlockWallSign.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include "BlockHandler.h"
-#include "Chunk.h"
+#include "../Chunk.h"
 
 
 
diff --git a/src/Blocks/BroadcastInterface.h b/src/Blocks/BroadcastInterface.h
index 68a312dde..347ef270b 100644
--- a/src/Blocks/BroadcastInterface.h
+++ b/src/Blocks/BroadcastInterface.h
@@ -1,8 +1,8 @@
 
 #pragma once
 
-#include "Defines.h"
-#include "Scoreboard.h"
+#include "../Defines.h"
+#include "../Scoreboard.h"
 
 // fwd:
 class cClientHandle;
diff --git a/src/Blocks/ChunkInterface.cpp b/src/Blocks/ChunkInterface.cpp
index 6aa8fbf4f..28dd1ac36 100644
--- a/src/Blocks/ChunkInterface.cpp
+++ b/src/Blocks/ChunkInterface.cpp
@@ -2,9 +2,9 @@
 #include "Globals.h"
 
 #include "ChunkInterface.h"
-#include "ChunkMap.h"
 #include "BlockHandler.h"
 #include "WorldInterface.h"
+#include "../ChunkMap.h"
 
 
 
diff --git a/src/Blocks/WorldInterface.h b/src/Blocks/WorldInterface.h
index e49283402..da9075fb4 100644
--- a/src/Blocks/WorldInterface.h
+++ b/src/Blocks/WorldInterface.h
@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "FunctionRef.h"
+#include "../FunctionRef.h"
 #include "../Mobs/MonsterTypes.h"
 
 class cBedEntity;
@@ -13,6 +13,7 @@ class cPlayer;
 using cBedCallback         = cFunctionRef<bool(cBedEntity   &)>;
 using cBlockEntityCallback = cFunctionRef<bool(cBlockEntity &)>;
 using cPlayerListCallback  = cFunctionRef<bool(cPlayer      &)>;
+using cEntityCallback      = cFunctionRef<bool(cEntity      &)>;
 
 
 
-- 
cgit v1.2.3