From a78fd671b229b32b04a7abf9018edb7a6c08ccbe Mon Sep 17 00:00:00 2001 From: KingCol13 <48412633+KingCol13@users.noreply.github.com> Date: Fri, 25 Sep 2020 10:13:59 +0100 Subject: Deleted BiomeDef.h and ChunkDef.h from Globals.h (#4885) * Removed BiomeDef.h * Removed ChunkDef.h from Globals.h * Added to CONTRIBUTORS. * Re-added empty last line to Globals.h * Included stddef and StringUtils in BiomeDef.h * Fixed build tools compiling. It compiles, but at what cost? * Added include to src/Generating/Trees.h * Include added in ChunkGeneratorThread.h * Moved rearranged includes in LineBlockTracer.cpp * Re-arrange headers in ChunkInterface.cpp * Included ChunkDef.h in Path.h * Included ChunkDef.h in NBTChunkSerializer.h * Rearranged included and added required includes to headers. * Removed unnecessary included in StringUtils.h. --- src/Generating/ChunkGenerator.h | 2 +- src/Generating/IntGen.h | 1 + src/Generating/Trees.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/Generating') diff --git a/src/Generating/ChunkGenerator.h b/src/Generating/ChunkGenerator.h index 52c9cd896..5b9f2c0ac 100644 --- a/src/Generating/ChunkGenerator.h +++ b/src/Generating/ChunkGenerator.h @@ -1,7 +1,7 @@ #pragma once #include "../Defines.h" - +#include "ChunkDef.h" diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h index 3b9f3b027..786c6099d 100644 --- a/src/Generating/IntGen.h +++ b/src/Generating/IntGen.h @@ -31,6 +31,7 @@ by using templates. #include #include "../Noise/Noise.h" +#include "BiomeDef.h" diff --git a/src/Generating/Trees.h b/src/Generating/Trees.h index c9fa0ec18..99a5c24f9 100644 --- a/src/Generating/Trees.h +++ b/src/Generating/Trees.h @@ -18,7 +18,7 @@ logs can overwrite others(leaves), but others shouldn't overwrite logs. This is #pragma once #include "../Noise/Noise.h" - +#include "../ChunkDef.h" // For sSetBlockVector -- cgit v1.2.3