1
0

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.
This commit is contained in:
KingCol13 2020-09-25 10:13:59 +01:00 committed by GitHub
parent 5bd12814db
commit a78fd671b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 26 additions and 33 deletions

View File

@ -120,6 +120,7 @@ typedef unsigned char Byte;
#include <cmath>
#include <cstdarg>
#include <ctime>
#include <cstddef>
@ -189,10 +190,3 @@ auto ToUnsigned(T a_Val)
return static_cast<std::make_unsigned_t<T>>(a_Val);
}
#include "BiomeDef.h"

View File

@ -169,8 +169,6 @@ typedef unsigned char Byte;
#define VERIFY(x) (!!(x) || (LOGERROR("Verification failed: %s, file %s, line %i", #x, __FILE__, __LINE__), exit(1), 0))
#include "BiomeDef.h"

View File

@ -275,7 +275,5 @@ T Clamp(T a_Value, T a_Min, T a_Max)
// Common headers (part 2, with macros):
#include "src/ChunkDef.h"
#include "src/BiomeDef.h"
#include "src/BlockID.h"
#include "src/BlockInfo.h"

View File

@ -3,7 +3,9 @@
// Implements biome helper functions
#include "Globals.h"
#include "BiomeDef.h"

View File

@ -9,10 +9,6 @@
#pragma once
// tolua_begin
/** Biome IDs
The first batch corresponds to the clientside biomes, used by MineCraft.

View File

@ -1,7 +1,7 @@
#pragma once
#include "ChunkDef.h"

View File

@ -1,6 +1,7 @@
#pragma once
#include "ChunkDef.h"

View File

@ -14,7 +14,7 @@
#include "Defines.h"
#include "ChunkDef.h"

View File

@ -1,5 +1,6 @@
#pragma once
#include "ChunkDef.h"
// tolua_begin

View File

@ -3,7 +3,7 @@
#include "../ForEachChunkProvider.h"
#include "../FunctionRef.h"
#include "ChunkDef.h"

View File

@ -13,7 +13,7 @@
#include <cstring>
#include "AllocationPool.h"
#include "ChunkDef.h"
class cChunkData

View File

@ -9,7 +9,7 @@
#pragma once
#include "BiomeDef.h"

View File

@ -1,7 +1,7 @@
#pragma once
#include "OSSupport/IsThread.h"
#include "ChunkDef.h"

View File

@ -12,7 +12,7 @@ not unload
#pragma once
#include "ChunkDef.h"

View File

@ -1,7 +1,7 @@
#pragma once
#include "../Defines.h"
#include "ChunkDef.h"

View File

@ -31,6 +31,7 @@ by using templates.
#include <tuple>
#include "../Noise/Noise.h"
#include "BiomeDef.h"

View File

@ -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

View File

@ -355,5 +355,4 @@ auto ToUnsigned(T a_Val)
// Common headers (part 2, with macros):
#include "Vector3.h"
#include "BiomeDef.h"
#include "ChunkDef.h"

View File

@ -10,7 +10,7 @@
#pragma once
#include "Defines.h"
#include "ChunkDef.h"

View File

@ -1,6 +1,8 @@
#pragma once
#include "ChunkDef.h"
/*
// Needed Fwds: cPath
enum class ePathFinderStatus;

View File

@ -28,7 +28,7 @@ For reading entire files into memory, just use the static cFile::ReadWholeFile()
#pragma once
#include "StringUtils.h"

View File

@ -8,7 +8,7 @@
#include "Protocol/Authenticator.h"
#include "Protocol/MojangAPI.h"
#include "RankManager.h"
#include "ChunkDef.h"

View File

@ -12,6 +12,7 @@
#include "FunctionRef.h"
#include "ChunkDef.h"
class cObjective;

View File

@ -1,6 +1,8 @@
#pragma once
#include "ChunkDef.h"
class cWorld;
class cChunk;
class cCuboid;

View File

@ -8,8 +8,6 @@
#pragma once
typedef std::string AString;
typedef std::vector<AString> AStringVector;
typedef std::list<AString> AStringList;

View File

@ -2,7 +2,7 @@
#pragma once
#include "ChunkDef.h"

View File

@ -14,7 +14,7 @@
#include "../OSSupport/IsThread.h"
#include "../OSSupport/Queue.h"
#include "ChunkDef.h"