summaryrefslogtreecommitdiffstats
path: root/src/Mobs
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/Mobs
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/Mobs/CMakeLists.txt3
-rw-r--r--src/Mobs/Horse.cpp2
-rw-r--r--src/Mobs/Horse.h2
-rw-r--r--src/Mobs/Monster.cpp2
-rw-r--r--src/Mobs/PassiveMonster.cpp2
-rw-r--r--src/Mobs/Sheep.cpp2
-rw-r--r--src/Mobs/Skeleton.cpp2
-rw-r--r--src/Mobs/Slime.cpp4
-rw-r--r--src/Mobs/Villager.h2
-rw-r--r--src/Mobs/Witch.cpp2
-rw-r--r--src/Mobs/ZombiePigman.cpp2
11 files changed, 11 insertions, 14 deletions
diff --git a/src/Mobs/CMakeLists.txt b/src/Mobs/CMakeLists.txt
index fedff213b..d9969cfdc 100644
--- a/src/Mobs/CMakeLists.txt
+++ b/src/Mobs/CMakeLists.txt
@@ -1,6 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
SET (SRCS
AggressiveMonster.cpp
diff --git a/src/Mobs/Horse.cpp b/src/Mobs/Horse.cpp
index 9e04bf106..61b25e7a3 100644
--- a/src/Mobs/Horse.cpp
+++ b/src/Mobs/Horse.cpp
@@ -4,7 +4,7 @@
#include "../World.h"
#include "../EffectID.h"
#include "../Entities/Player.h"
-#include "UI/HorseWindow.h"
+#include "../UI/HorseWindow.h"
diff --git a/src/Mobs/Horse.h b/src/Mobs/Horse.h
index 38625001e..68ad82b56 100644
--- a/src/Mobs/Horse.h
+++ b/src/Mobs/Horse.h
@@ -2,7 +2,7 @@
#pragma once
#include "PassiveMonster.h"
-#include "UI/WindowOwner.h"
+#include "../UI/WindowOwner.h"
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index 5327da832..dfcd0dd6a 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -11,7 +11,7 @@
#include "../Entities/Player.h"
#include "../Entities/ExpOrb.h"
#include "../MonsterConfig.h"
-#include "BoundingBox.h"
+#include "../BoundingBox.h"
#include "../Chunk.h"
#include "../FastRandom.h"
diff --git a/src/Mobs/PassiveMonster.cpp b/src/Mobs/PassiveMonster.cpp
index cd0f59153..17b9bddb3 100644
--- a/src/Mobs/PassiveMonster.cpp
+++ b/src/Mobs/PassiveMonster.cpp
@@ -4,7 +4,7 @@
#include "PassiveMonster.h"
#include "../World.h"
#include "../Entities/Player.h"
-#include "BoundingBox.h"
+#include "../BoundingBox.h"
#include "../Items/ItemSpawnEgg.h"
diff --git a/src/Mobs/Sheep.cpp b/src/Mobs/Sheep.cpp
index 415379034..3276e45a2 100644
--- a/src/Mobs/Sheep.cpp
+++ b/src/Mobs/Sheep.cpp
@@ -5,7 +5,7 @@
#include "../Entities/Player.h"
#include "../World.h"
#include "../EffectID.h"
-#include "FastRandom.h"
+#include "../FastRandom.h"
diff --git a/src/Mobs/Skeleton.cpp b/src/Mobs/Skeleton.cpp
index e48991a06..2a8ca3ddb 100644
--- a/src/Mobs/Skeleton.cpp
+++ b/src/Mobs/Skeleton.cpp
@@ -4,7 +4,7 @@
#include "Skeleton.h"
#include "../World.h"
#include "../Entities/ArrowEntity.h"
-#include "ClientHandle.h"
+#include "../ClientHandle.h"
diff --git a/src/Mobs/Slime.cpp b/src/Mobs/Slime.cpp
index 291a3a57f..3198ce801 100644
--- a/src/Mobs/Slime.cpp
+++ b/src/Mobs/Slime.cpp
@@ -2,8 +2,8 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "Slime.h"
-#include "FastRandom.h"
-#include "World.h"
+#include "../FastRandom.h"
+#include "../World.h"
diff --git a/src/Mobs/Villager.h b/src/Mobs/Villager.h
index 6f3e7b4e8..b9a0b7675 100644
--- a/src/Mobs/Villager.h
+++ b/src/Mobs/Villager.h
@@ -2,7 +2,7 @@
#pragma once
#include "PassiveMonster.h"
-#include "Blocks/ChunkInterface.h"
+#include "../Blocks/ChunkInterface.h"
diff --git a/src/Mobs/Witch.cpp b/src/Mobs/Witch.cpp
index 3f56108ae..a4c81a63e 100644
--- a/src/Mobs/Witch.cpp
+++ b/src/Mobs/Witch.cpp
@@ -2,7 +2,7 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "Witch.h"
-#include "FastRandom.h"
+#include "../FastRandom.h"
diff --git a/src/Mobs/ZombiePigman.cpp b/src/Mobs/ZombiePigman.cpp
index 2581d3751..7355c8201 100644
--- a/src/Mobs/ZombiePigman.cpp
+++ b/src/Mobs/ZombiePigman.cpp
@@ -2,7 +2,7 @@
#include "ZombiePigman.h"
#include "../World.h"
-#include "ClientHandle.h"
+#include "../ClientHandle.h"