summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorpeterbell10 <peterbell10@live.co.uk>2018-08-29 02:51:25 +0200
committerGitHub <noreply@github.com>2018-08-29 02:51:25 +0200
commitee8419701472be9f24c51a41ee7b7ef3cf38f329 (patch)
treeb689d4657ec4bb2de7e47f43f670e99b564f85a7 /src/Entities
parentStore and pass entity effect duration as an int not a short. (#4293) (diff)
downloadcuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.tar
cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.tar.gz
cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.tar.bz2
cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.tar.lz
cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.tar.xz
cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.tar.zst
cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/CMakeLists.txt3
-rw-r--r--src/Entities/EnderCrystal.cpp2
-rw-r--r--src/Entities/Entity.cpp4
-rw-r--r--src/Entities/HangingEntity.cpp2
-rw-r--r--src/Entities/ItemFrame.cpp2
-rw-r--r--src/Entities/LeashKnot.cpp6
-rw-r--r--src/Entities/Minecart.h2
-rw-r--r--src/Entities/Painting.cpp2
-rw-r--r--src/Entities/Pawn.cpp4
-rw-r--r--src/Entities/Player.cpp4
10 files changed, 14 insertions, 17 deletions
diff --git a/src/Entities/CMakeLists.txt b/src/Entities/CMakeLists.txt
index 9bf49ebca..4c1190800 100644
--- a/src/Entities/CMakeLists.txt
+++ b/src/Entities/CMakeLists.txt
@@ -1,6 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
SET (SRCS
ArrowEntity.cpp
diff --git a/src/Entities/EnderCrystal.cpp b/src/Entities/EnderCrystal.cpp
index 79d0c50cb..d3725e14a 100644
--- a/src/Entities/EnderCrystal.cpp
+++ b/src/Entities/EnderCrystal.cpp
@@ -2,7 +2,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "EnderCrystal.h"
-#include "ClientHandle.h"
+#include "../ClientHandle.h"
#include "../Chunk.h"
#include "../World.h"
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index ac9aad92a..4c9900aa9 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -2,6 +2,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "Entity.h"
+#include "Player.h"
#include "../World.h"
#include "../Root.h"
#include "../Matrix4.h"
@@ -10,8 +11,7 @@
#include "../Simulator/FluidSimulator.h"
#include "../Bindings/PluginManager.h"
#include "../LineBlockTracer.h"
-#include "Player.h"
-#include "Items/ItemHandler.h"
+#include "../Items/ItemHandler.h"
#include "../FastRandom.h"
#include "../NetherPortalScanner.h"
#include "../BoundingBox.h"
diff --git a/src/Entities/HangingEntity.cpp b/src/Entities/HangingEntity.cpp
index a37d8702e..b3a50c91e 100644
--- a/src/Entities/HangingEntity.cpp
+++ b/src/Entities/HangingEntity.cpp
@@ -2,8 +2,8 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "HangingEntity.h"
-#include "ClientHandle.h"
#include "Player.h"
+#include "../ClientHandle.h"
diff --git a/src/Entities/ItemFrame.cpp b/src/Entities/ItemFrame.cpp
index a231ebaa3..72b910936 100644
--- a/src/Entities/ItemFrame.cpp
+++ b/src/Entities/ItemFrame.cpp
@@ -2,8 +2,8 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "ItemFrame.h"
-#include "ClientHandle.h"
#include "Player.h"
+#include "../ClientHandle.h"
diff --git a/src/Entities/LeashKnot.cpp b/src/Entities/LeashKnot.cpp
index 59f08d271..4002e11e3 100644
--- a/src/Entities/LeashKnot.cpp
+++ b/src/Entities/LeashKnot.cpp
@@ -2,10 +2,10 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "LeashKnot.h"
-#include "ClientHandle.h"
#include "Player.h"
-#include "Mobs/Monster.h"
-#include "BoundingBox.h"
+#include "../Mobs/Monster.h"
+#include "../BoundingBox.h"
+#include "../ClientHandle.h"
// Ticks to wait in Tick function to optimize calculations
#define TICK_STEP 10
diff --git a/src/Entities/Minecart.h b/src/Entities/Minecart.h
index 99885faf9..ef5b9e030 100644
--- a/src/Entities/Minecart.h
+++ b/src/Entities/Minecart.h
@@ -10,7 +10,7 @@
#pragma once
#include "Entity.h"
-#include "World.h"
+#include "../World.h"
#include "../UI/WindowOwner.h"
diff --git a/src/Entities/Painting.cpp b/src/Entities/Painting.cpp
index 507c911af..5f7ab6245 100644
--- a/src/Entities/Painting.cpp
+++ b/src/Entities/Painting.cpp
@@ -2,8 +2,8 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "Painting.h"
-#include "ClientHandle.h"
#include "Player.h"
+#include "../ClientHandle.h"
#include "../Chunk.h"
diff --git a/src/Entities/Pawn.cpp b/src/Entities/Pawn.cpp
index dc87c5227..ba91258e9 100644
--- a/src/Entities/Pawn.cpp
+++ b/src/Entities/Pawn.cpp
@@ -5,9 +5,9 @@
#include "Player.h"
#include "../World.h"
#include "../Bindings/PluginManager.h"
-#include "BoundingBox.h"
+#include "../BoundingBox.h"
#include "../Blocks/BlockHandler.h"
-#include "EffectID.h"
+#include "../EffectID.h"
#include "../Mobs/Monster.h"
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 8d94ab7c5..cd1414adb 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -4,8 +4,8 @@
#include <unordered_map>
#include "Player.h"
-#include "Mobs/Wolf.h"
-#include "Mobs/Horse.h"
+#include "../Mobs/Wolf.h"
+#include "../Mobs/Horse.h"
#include "../BoundingBox.h"
#include "../ChatColor.h"
#include "../Server.h"