summaryrefslogtreecommitdiffstats
path: root/src/Generating
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/Generating
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/Generating/CMakeLists.txt3
-rw-r--r--src/Generating/ChunkGenerator.cpp4
-rw-r--r--src/Generating/PieceStructuresGen.cpp2
-rw-r--r--src/Generating/PrefabPiecePool.cpp4
4 files changed, 5 insertions, 8 deletions
diff --git a/src/Generating/CMakeLists.txt b/src/Generating/CMakeLists.txt
index c7980a096..f01647d0e 100644
--- a/src/Generating/CMakeLists.txt
+++ b/src/Generating/CMakeLists.txt
@@ -1,6 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
SET (SRCS
BioGen.cpp
diff --git a/src/Generating/ChunkGenerator.cpp b/src/Generating/ChunkGenerator.cpp
index 103920498..166a05ca2 100644
--- a/src/Generating/ChunkGenerator.cpp
+++ b/src/Generating/ChunkGenerator.cpp
@@ -2,11 +2,11 @@
#include "Globals.h"
#include "ChunkGenerator.h"
-#include "../IniFile.h"
#include "ChunkDesc.h"
#include "ComposableGenerator.h"
#include "Noise3DGenerator.h"
-#include "FastRandom.h"
+#include "../IniFile.h"
+#include "../FastRandom.h"
diff --git a/src/Generating/PieceStructuresGen.cpp b/src/Generating/PieceStructuresGen.cpp
index c1648e258..4f31c6833 100644
--- a/src/Generating/PieceStructuresGen.cpp
+++ b/src/Generating/PieceStructuresGen.cpp
@@ -7,7 +7,7 @@
#include "PieceStructuresGen.h"
#include "PrefabStructure.h"
#include "PieceGeneratorBFSTree.h"
-#include "IniFile.h"
+#include "../IniFile.h"
#include "../Stopwatch.h"
diff --git a/src/Generating/PrefabPiecePool.cpp b/src/Generating/PrefabPiecePool.cpp
index fb8f252c0..16d1f3440 100644
--- a/src/Generating/PrefabPiecePool.cpp
+++ b/src/Generating/PrefabPiecePool.cpp
@@ -5,9 +5,9 @@
#include "Globals.h"
#include "PrefabPiecePool.h"
-#include "../Bindings/LuaState.h"
-#include "WorldStorage/SchematicFileSerializer.h"
#include "VerticalStrategy.h"
+#include "../Bindings/LuaState.h"
+#include "../WorldStorage/SchematicFileSerializer.h"
#include "../StringCompression.h"