summaryrefslogtreecommitdiffstats
path: root/src/Generating
diff options
context:
space:
mode:
Diffstat (limited to 'src/Generating')
-rw-r--r--src/Generating/BioGen.cpp1
-rw-r--r--src/Generating/Caves.cpp2
-rw-r--r--src/Generating/ChunkDesc.cpp2
-rw-r--r--src/Generating/ChunkGenerator.cpp1
-rw-r--r--src/Generating/CompoGenBiomal.cpp1
-rw-r--r--src/Generating/DungeonRoomsFinisher.cpp2
-rw-r--r--src/Generating/HeiGen.cpp1
-rw-r--r--src/Generating/IntGen.h3
-rw-r--r--src/Generating/Noise3DGenerator.cpp1
-rw-r--r--src/Generating/PieceStructuresGen.cpp2
-rw-r--r--src/Generating/Prefab.cpp1
-rw-r--r--src/Generating/ProtIntGen.h3
-rw-r--r--src/Generating/Ravines.cpp1
-rw-r--r--src/Generating/Ravines.h1
-rw-r--r--src/Generating/StructGen.h1
15 files changed, 6 insertions, 17 deletions
diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp
index 17f778c4a..09631d098 100644
--- a/src/Generating/BioGen.cpp
+++ b/src/Generating/BioGen.cpp
@@ -382,6 +382,7 @@ void cBioGenDistortedVoronoi::InitializeBiomeGen(cIniFile & a_IniFile)
+
void cBioGenDistortedVoronoi::Distort(int a_BlockX, int a_BlockZ, int & a_DistortedX, int & a_DistortedZ)
{
double NoiseX = m_Noise.CubicNoise3D(static_cast<float>(a_BlockX / m_CellSize), static_cast<float>(a_BlockZ / m_CellSize), 1000);
diff --git a/src/Generating/Caves.cpp b/src/Generating/Caves.cpp
index 7057cd349..240248b5a 100644
--- a/src/Generating/Caves.cpp
+++ b/src/Generating/Caves.cpp
@@ -609,7 +609,6 @@ cStructGenWormNestCaves::cCaveSystem::~cCaveSystem()
-
void cStructGenWormNestCaves::cCaveSystem::DrawIntoChunk(cChunkDesc & a_ChunkDesc)
{
int ChunkX = a_ChunkDesc.GetChunkX();
@@ -701,7 +700,6 @@ cGridStructGen::cStructurePtr cStructGenWormNestCaves::CreateStructure(int a_Gri
-
////////////////////////////////////////////////////////////////////////////////
// cStructGenMarbleCaves:
diff --git a/src/Generating/ChunkDesc.cpp b/src/Generating/ChunkDesc.cpp
index 451451fd3..e5d213fe6 100644
--- a/src/Generating/ChunkDesc.cpp
+++ b/src/Generating/ChunkDesc.cpp
@@ -124,6 +124,7 @@ void cChunkDesc::SetBiome(int a_RelX, int a_RelZ, EMCSBiome a_BiomeID)
+
EMCSBiome cChunkDesc::GetBiome(int a_RelX, int a_RelZ)
{
return cChunkDef::GetBiome(m_BiomeMap, a_RelX, a_RelZ);
@@ -268,6 +269,7 @@ bool cChunkDesc::IsUsingDefaultFinish(void) const
+
void cChunkDesc::WriteBlockArea(const cBlockArea & a_BlockArea, int a_RelX, int a_RelY, int a_RelZ, cBlockArea::eMergeStrategy a_MergeStrategy)
{
m_BlockArea.Merge(a_BlockArea, a_RelX, a_RelY, a_RelZ, a_MergeStrategy);
diff --git a/src/Generating/ChunkGenerator.cpp b/src/Generating/ChunkGenerator.cpp
index 3ac128c46..103920498 100644
--- a/src/Generating/ChunkGenerator.cpp
+++ b/src/Generating/ChunkGenerator.cpp
@@ -282,6 +282,7 @@ void cChunkGenerator::Execute(void)
+
void cChunkGenerator::DoGenerate(int a_ChunkX, int a_ChunkZ)
{
ASSERT(m_PluginInterface != nullptr);
diff --git a/src/Generating/CompoGenBiomal.cpp b/src/Generating/CompoGenBiomal.cpp
index f2835dfe1..624885ede 100644
--- a/src/Generating/CompoGenBiomal.cpp
+++ b/src/Generating/CompoGenBiomal.cpp
@@ -156,7 +156,6 @@ static cPattern::BlockInfo tbOFOrangeClay[] =
-
////////////////////////////////////////////////////////////////////////////////
// Individual patterns to use:
diff --git a/src/Generating/DungeonRoomsFinisher.cpp b/src/Generating/DungeonRoomsFinisher.cpp
index 2b4b94993..06d45ce8c 100644
--- a/src/Generating/DungeonRoomsFinisher.cpp
+++ b/src/Generating/DungeonRoomsFinisher.cpp
@@ -283,7 +283,6 @@ protected:
-
////////////////////////////////////////////////////////////////////////////////
// cDungeonRoomsFinisher:
@@ -308,7 +307,6 @@ cDungeonRoomsFinisher::cDungeonRoomsFinisher(cTerrainShapeGenPtr a_ShapeGen, int
-
cDungeonRoomsFinisher::cStructurePtr cDungeonRoomsFinisher::CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ)
{
// Select a random room size in each direction:
diff --git a/src/Generating/HeiGen.cpp b/src/Generating/HeiGen.cpp
index 42df16e73..20e8b966f 100644
--- a/src/Generating/HeiGen.cpp
+++ b/src/Generating/HeiGen.cpp
@@ -295,7 +295,6 @@ bool cHeiGenMultiCache::GetHeightAt(int a_ChunkX, int a_ChunkZ, int a_RelX, int
-
////////////////////////////////////////////////////////////////////////////////
// cHeiGenClassic:
diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h
index 794fbfc0e..ae46b2de2 100644
--- a/src/Generating/IntGen.h
+++ b/src/Generating/IntGen.h
@@ -174,7 +174,6 @@ protected:
-
/** Generates a 2D array of random integers in the specified range [0 .. Range). */
template <int Range, int SizeX, int SizeZ = SizeX>
class cIntGenChoice :
@@ -206,7 +205,6 @@ public:
-
/** Decides between the ocean and landmass biomes.
Has a threshold (in percent) of how much land, the larger the threshold, the more land.
Generates 0 for ocean, biome group ID for landmass. */
@@ -1117,7 +1115,6 @@ protected:
-
/** Adds a "rare" flag to random biome groups, based on the given chance. */
template <int SizeX, int SizeZ = SizeX>
class cIntGenRareBiomeGroups:
diff --git a/src/Generating/Noise3DGenerator.cpp b/src/Generating/Noise3DGenerator.cpp
index 6d07ce67e..4972a0505 100644
--- a/src/Generating/Noise3DGenerator.cpp
+++ b/src/Generating/Noise3DGenerator.cpp
@@ -783,6 +783,7 @@ void cBiomalNoise3DComposable::GetBiomeParams(EMCSBiome a_Biome, NOISE_DATATYPE
+
void cBiomalNoise3DComposable::GenShape(int a_ChunkX, int a_ChunkZ, cChunkDesc::Shape & a_Shape)
{
GenerateNoiseArrayIfNeeded(a_ChunkX, a_ChunkZ);
diff --git a/src/Generating/PieceStructuresGen.cpp b/src/Generating/PieceStructuresGen.cpp
index 2dae8c295..c1648e258 100644
--- a/src/Generating/PieceStructuresGen.cpp
+++ b/src/Generating/PieceStructuresGen.cpp
@@ -14,7 +14,6 @@
-
class cPieceStructuresGen::cGen:
public cGridStructGen
{
@@ -119,7 +118,6 @@ protected:
-
////////////////////////////////////////////////////////////////////////////////
// cPieceStructuresGen:
diff --git a/src/Generating/Prefab.cpp b/src/Generating/Prefab.cpp
index 818b8254c..1f2b5c916 100644
--- a/src/Generating/Prefab.cpp
+++ b/src/Generating/Prefab.cpp
@@ -137,6 +137,7 @@ void cPrefab::Draw(cChunkDesc & a_Dest, const cPlacedPiece * a_Placement) const
+
void cPrefab::Draw(cChunkDesc & a_Dest, const Vector3i & a_Placement, int a_NumRotations) const
{
// Draw the basic image:
diff --git a/src/Generating/ProtIntGen.h b/src/Generating/ProtIntGen.h
index 08143cf6d..24cdafa15 100644
--- a/src/Generating/ProtIntGen.h
+++ b/src/Generating/ProtIntGen.h
@@ -106,7 +106,6 @@ protected:
-
/** Generates a 2D array of random integers in the specified range [0 .. Range). */
class cProtIntGenChoice :
public cProtIntGenWithNoise
@@ -141,7 +140,6 @@ protected:
-
/** Decides between the ocean and landmass biomes.
Has a threshold (in percent) of how much land, the larger the threshold, the more land.
Generates 0 for ocean, biome group ID for landmass. */
@@ -1366,7 +1364,6 @@ protected:
-
/** Adds a "rare" flag to random biome groups, based on the given chance. */
class cProtIntGenRareBiomeGroups:
public cProtIntGenWithNoise
diff --git a/src/Generating/Ravines.cpp b/src/Generating/Ravines.cpp
index 1dd58a7b8..f1d5fdb23 100644
--- a/src/Generating/Ravines.cpp
+++ b/src/Generating/Ravines.cpp
@@ -99,7 +99,6 @@ cGridStructGen::cStructurePtr cStructGenRavines::CreateStructure(int a_GridX, in
-
////////////////////////////////////////////////////////////////////////////////
// cStructGenRavines::cRavine
diff --git a/src/Generating/Ravines.h b/src/Generating/Ravines.h
index 5353978d0..bcfdcc0d2 100644
--- a/src/Generating/Ravines.h
+++ b/src/Generating/Ravines.h
@@ -35,4 +35,3 @@ protected:
-
diff --git a/src/Generating/StructGen.h b/src/Generating/StructGen.h
index a9ada6c1e..15671453a 100644
--- a/src/Generating/StructGen.h
+++ b/src/Generating/StructGen.h
@@ -106,7 +106,6 @@ protected:
-
class cStructGenDirectOverhangs :
public cFinishGen
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 05:35:04 +0100