summaryrefslogtreecommitdiffstats
path: root/src/Generating
diff options
context:
space:
mode:
Diffstat (limited to 'src/Generating')
-rw-r--r--src/Generating/Caves.cpp4
-rw-r--r--src/Generating/ChunkGenerator.cpp4
-rw-r--r--src/Generating/FinishGen.cpp2
-rw-r--r--src/Generating/HeiGen.cpp2
-rw-r--r--src/Generating/IntGen.h4
-rw-r--r--src/Generating/Noise3DGenerator.cpp2
-rw-r--r--src/Generating/ProtIntGen.h2
-rw-r--r--src/Generating/RainbowRoadsGen.cpp2
-rw-r--r--src/Generating/RainbowRoadsGen.h2
-rw-r--r--src/Generating/Ravines.cpp4
-rw-r--r--src/Generating/StructGen.cpp2
-rw-r--r--src/Generating/TestRailsGen.cpp2
-rw-r--r--src/Generating/TestRailsGen.h4
-rw-r--r--src/Generating/Trees.cpp4
-rw-r--r--src/Generating/UnderwaterBaseGen.cpp2
-rw-r--r--src/Generating/UnderwaterBaseGen.h2
-rw-r--r--src/Generating/VillageGen.cpp2
-rw-r--r--src/Generating/VillageGen.h2
18 files changed, 24 insertions, 24 deletions
diff --git a/src/Generating/Caves.cpp b/src/Generating/Caves.cpp
index 1e8dbef90..0a9b170fa 100644
--- a/src/Generating/Caves.cpp
+++ b/src/Generating/Caves.cpp
@@ -237,7 +237,7 @@ bool cCaveTunnel::RefineDefPoints(const cCaveDefPoints & a_Src, cCaveDefPoints &
return true;
}
- // Smoothing: for each line segment, add points on its 1/4 lengths
+ // Smoothing: for each line segment, add points on its 1 / 4 lengths
bool res = false;
size_t Num = a_Src.size() - 2; // this many intermediary points
a_Dst.clear();
@@ -488,7 +488,7 @@ void cCaveTunnel::ProcessChunk(
continue;
}
- // Carve out a sphere around the xyz point, m_Radius in diameter; skip 3/7 off the top and bottom:
+ // Carve out a sphere around the xyz point, m_Radius in diameter; skip 3 / 7 off the top and bottom:
int DifX = itr->m_BlockX - BlockStartX; // substitution for faster calc
int DifY = itr->m_BlockY;
int DifZ = itr->m_BlockZ - BlockStartZ; // substitution for faster calc
diff --git a/src/Generating/ChunkGenerator.cpp b/src/Generating/ChunkGenerator.cpp
index 854aac60d..72d8f5258 100644
--- a/src/Generating/ChunkGenerator.cpp
+++ b/src/Generating/ChunkGenerator.cpp
@@ -209,7 +209,7 @@ void cChunkGenerator::Execute(void)
{
if ((NumChunksGenerated > 16) && (clock() - LastReportTick > CLOCKS_PER_SEC))
{
- LOG("Chunk generator performance: %.2f ch/s (%d ch total)",
+ LOG("Chunk generator performance: %.2f ch / sec (%d ch total)",
(double)NumChunksGenerated * CLOCKS_PER_SEC/ (clock() - GenerationStart),
NumChunksGenerated
);
@@ -241,7 +241,7 @@ void cChunkGenerator::Execute(void)
// Display perf info once in a while:
if ((NumChunksGenerated > 16) && (clock() - LastReportTick > 2 * CLOCKS_PER_SEC))
{
- LOG("Chunk generator performance: %.2f ch/s (%d ch total)",
+ LOG("Chunk generator performance: %.2f ch / sec (%d ch total)",
(double)NumChunksGenerated * CLOCKS_PER_SEC / (clock() - GenerationStart),
NumChunksGenerated
);
diff --git a/src/Generating/FinishGen.cpp b/src/Generating/FinishGen.cpp
index 7541c8598..00b34bddd 100644
--- a/src/Generating/FinishGen.cpp
+++ b/src/Generating/FinishGen.cpp
@@ -195,7 +195,7 @@ void cFinishGenGlowStone::GenFinish(cChunkDesc & a_ChunkDesc)
// The maximum size for a string of glowstone can get 3 - 5 blocks long
int Size = 3 + m_Noise.IntNoise3DInt(ChunkX, i, ChunkZ) % 3;
- // Generate X/Z coordinates.
+ // Generate X / Z coordinates.
int X = Size + (m_Noise.IntNoise2DInt(i, Size) % (cChunkDef::Width - Size * 2));
int Z = Size + (m_Noise.IntNoise2DInt(X, i) % (cChunkDef::Width - Size * 2));
diff --git a/src/Generating/HeiGen.cpp b/src/Generating/HeiGen.cpp
index 54567cb4d..e34ffc57c 100644
--- a/src/Generating/HeiGen.cpp
+++ b/src/Generating/HeiGen.cpp
@@ -667,7 +667,7 @@ public:
virtual void GenHeightMap(int a_ChunkX, int a_ChunkZ, cChunkDef::HeightMap & a_HeightMap)
{
- // Generate the biomes for the 3*3 neighbors:
+ // Generate the biomes for the 3 * 3 neighbors:
cChunkDef::BiomeMap neighborBiomes[3][3];
for (int z = 0; z < 3; z++) for (int x = 0; x < 3; x++)
{
diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h
index 854563f41..9cc881639 100644
--- a/src/Generating/IntGen.h
+++ b/src/Generating/IntGen.h
@@ -5,7 +5,7 @@
/*
The integers generated may be interpreted in several ways:
-- land/see designators
+- land / sea designators
- 0 = ocean
- >0 = land
- biome group
@@ -310,7 +310,7 @@ public:
}
}
- // Copy from Cache into a_Values; take into account the even/odd offsets in a_Min:
+ // Copy from Cache into a_Values; take into account the even / odd offsets in a_Min:
for (int z = 0; z < SizeZ; ++z)
{
memcpy(a_Values + z * SizeX, cache + (z + (a_MinZ & 1)) * lowStepX + (a_MinX & 1), SizeX * sizeof(int));
diff --git a/src/Generating/Noise3DGenerator.cpp b/src/Generating/Noise3DGenerator.cpp
index eadc66a4e..63e88c2a8 100644
--- a/src/Generating/Noise3DGenerator.cpp
+++ b/src/Generating/Noise3DGenerator.cpp
@@ -680,7 +680,7 @@ void cBiomalNoise3DComposable::GenerateNoiseArrayIfNeeded(int a_ChunkX, int a_Ch
void cBiomalNoise3DComposable::CalcBiomeParamArrays(int a_ChunkX, int a_ChunkZ, ChunkParam & a_HeightAmp, ChunkParam & a_MidPoint)
{
- // Generate the 3*3 chunks of biomes around this chunk:
+ // Generate the 3 * 3 chunks of biomes around this chunk:
cChunkDef::BiomeMap neighborBiomes[3 * 3];
for (int z = 0; z < 3; z++)
{
diff --git a/src/Generating/ProtIntGen.h b/src/Generating/ProtIntGen.h
index e709222fe..9e471e8bb 100644
--- a/src/Generating/ProtIntGen.h
+++ b/src/Generating/ProtIntGen.h
@@ -229,7 +229,7 @@ public:
}
}
- // Copy from Cache into a_Values; take into account the even/odd offsets in a_Min:
+ // Copy from Cache into a_Values; take into account the even / odd offsets in a_Min:
for (int z = 0; z < a_SizeZ; ++z)
{
memcpy(a_Values + z * a_SizeX, cache + (z + (a_MinZ & 1)) * lowStepX + (a_MinX & 1), a_SizeX * sizeof(int));
diff --git a/src/Generating/RainbowRoadsGen.cpp b/src/Generating/RainbowRoadsGen.cpp
index c3c07cdec..fd4a81692 100644
--- a/src/Generating/RainbowRoadsGen.cpp
+++ b/src/Generating/RainbowRoadsGen.cpp
@@ -61,7 +61,7 @@ protected:
/** The noise used as a pseudo-random generator */
cNoise m_Noise;
- /** Maximum size, in X/Z blocks, of the village (radius from the origin) */
+ /** Maximum size, in X / Z blocks, of the village (radius from the origin) */
int m_MaxSize;
/** Borders of the vilalge - no item may reach out of this cuboid. */
diff --git a/src/Generating/RainbowRoadsGen.h b/src/Generating/RainbowRoadsGen.h
index 5813e1d14..52d48ceca 100644
--- a/src/Generating/RainbowRoadsGen.h
+++ b/src/Generating/RainbowRoadsGen.h
@@ -34,7 +34,7 @@ protected:
/** Maximum depth of the generator tree*/
int m_MaxDepth;
- /** Maximum size, in X/Z blocks, of the base (radius from the origin) */
+ /** Maximum size, in X / Z blocks, of the structure (radius from the origin) */
int m_MaxSize;
diff --git a/src/Generating/Ravines.cpp b/src/Generating/Ravines.cpp
index 70b9d0b62..9f8f69139 100644
--- a/src/Generating/Ravines.cpp
+++ b/src/Generating/Ravines.cpp
@@ -124,7 +124,7 @@ cStructGenRavines::cRavine::cRavine(int a_GridX, int a_GridZ, int a_OriginX, int
void cStructGenRavines::cRavine::GenerateBaseDefPoints(int a_BlockX, int a_BlockZ, int a_Size, cNoise & a_Noise)
{
- // Modify the size slightly to have different-sized ravines (1/2 to 1/1 of a_Size):
+ // Modify the size slightly to have different-sized ravines (1 / 2 to 1 / 1 of a_Size):
a_Size = (512 + ((a_Noise.IntNoise3DInt(19 * a_BlockX, 11 * a_BlockZ, a_BlockX + a_BlockZ) / 17) % 512)) * a_Size / 1024;
// The complete offset of the ravine from its cellpoint, up to 2 * a_Size in each direction
@@ -177,7 +177,7 @@ void cStructGenRavines::cRavine::RefineDefPoints(const cRavDefPoints & a_Src, cR
return;
}
- // Smoothing: for each line segment, add points on its 1/4 lengths
+ // Smoothing: for each line segment, add points on its 1 / 4 lengths
size_t Num = a_Src.size() - 2; // this many intermediary points
a_Dst.clear();
a_Dst.reserve(Num * 2 + 2);
diff --git a/src/Generating/StructGen.cpp b/src/Generating/StructGen.cpp
index 2d5a73739..7572cdcbf 100644
--- a/src/Generating/StructGen.cpp
+++ b/src/Generating/StructGen.cpp
@@ -311,7 +311,7 @@ void cStructGenOreNests::GenerateOre(int a_ChunkX, int a_ChunkZ, BLOCKTYPE a_Ore
rnd /= cChunkDef::Width;
int BaseY = rnd % a_MaxHeight;
rnd /= a_MaxHeight;
- int NestSize = a_NestSize + (rnd % (a_NestSize / 4)); // The actual nest size may be up to 1/4 larger
+ int NestSize = a_NestSize + (rnd % (a_NestSize / 4)); // The actual nest size may be up to 1 / 4 larger
int Num = 0;
while (Num < NestSize)
{
diff --git a/src/Generating/TestRailsGen.cpp b/src/Generating/TestRailsGen.cpp
index 66ab8b33f..8256b55a0 100644
--- a/src/Generating/TestRailsGen.cpp
+++ b/src/Generating/TestRailsGen.cpp
@@ -61,7 +61,7 @@ protected:
/** The noise used as a pseudo-random generator */
cNoise m_Noise;
- /** Maximum size, in X/Z blocks, of the structure (radius from the origin) */
+ /** Maximum size, in X / Z blocks, of the structure (radius from the origin) */
int m_MaxSize;
/** Borders of the structure - no item may reach out of this cuboid. */
diff --git a/src/Generating/TestRailsGen.h b/src/Generating/TestRailsGen.h
index 5b0ce95f4..88e38b368 100644
--- a/src/Generating/TestRailsGen.h
+++ b/src/Generating/TestRailsGen.h
@@ -31,10 +31,10 @@ protected:
/** The noise used for generating random numbers */
cNoise m_Noise;
- /** Maximum depth of the generator tree*/
+ /** Maximum depth of the generator tree */
int m_MaxDepth;
- /** Maximum size, in X/Z blocks, of the base (radius from the origin) */
+ /** Maximum size, in X / Z blocks, of the structure (radius from the origin) */
int m_MaxSize;
diff --git a/src/Generating/Trees.cpp b/src/Generating/Trees.cpp
index 9e72a688f..72fe5f819 100644
--- a/src/Generating/Trees.cpp
+++ b/src/Generating/Trees.cpp
@@ -499,7 +499,7 @@ void GetBirchTreeImage(int a_BlockX, int a_BlockY, int a_BlockZ, cNoise & a_Nois
PushCornerBlocks(a_BlockX, h, a_BlockZ, a_Seq, a_Noise, 0x5fffffff, a_OtherBlocks, 1, E_BLOCK_LEAVES, E_META_LEAVES_BIRCH);
h--;
- // Third and fourth layers - BigO2 and maybe 2*Corners:
+ // Third and fourth layers - BigO2 and maybe 2 * Corners:
for (int Row = 0; Row < 2; Row++)
{
PushCoordBlocks (a_BlockX, h, a_BlockZ, a_OtherBlocks, BigO2, ARRAYCOUNT(BigO2), E_BLOCK_LEAVES, E_META_LEAVES_BIRCH);
@@ -673,7 +673,7 @@ void GetTallBirchTreeImage(int a_BlockX, int a_BlockY, int a_BlockZ, cNoise & a_
PushCornerBlocks(a_BlockX, h, a_BlockZ, a_Seq, a_Noise, 0x5fffffff, a_OtherBlocks, 1, E_BLOCK_LEAVES, E_META_LEAVES_BIRCH);
h--;
- // Third and fourth layers - BigO2 and maybe 2*Corners:
+ // Third and fourth layers - BigO2 and maybe 2 * Corners:
for (int Row = 0; Row < 2; Row++)
{
PushCoordBlocks (a_BlockX, h, a_BlockZ, a_OtherBlocks, BigO2, ARRAYCOUNT(BigO2), E_BLOCK_LEAVES, E_META_LEAVES_BIRCH);
diff --git a/src/Generating/UnderwaterBaseGen.cpp b/src/Generating/UnderwaterBaseGen.cpp
index 8916f4b5f..dbc4aef1b 100644
--- a/src/Generating/UnderwaterBaseGen.cpp
+++ b/src/Generating/UnderwaterBaseGen.cpp
@@ -61,7 +61,7 @@ protected:
/** The noise used as a pseudo-random generator */
cNoise m_Noise;
- /** Maximum size, in X/Z blocks, of the village (radius from the origin) */
+ /** Maximum size, in X / Z blocks, of the base (radius from the origin) */
int m_MaxSize;
/** Borders of the vilalge - no item may reach out of this cuboid. */
diff --git a/src/Generating/UnderwaterBaseGen.h b/src/Generating/UnderwaterBaseGen.h
index b24eb1075..9433a1905 100644
--- a/src/Generating/UnderwaterBaseGen.h
+++ b/src/Generating/UnderwaterBaseGen.h
@@ -34,7 +34,7 @@ protected:
/** Maximum depth of the generator tree*/
int m_MaxDepth;
- /** Maximum size, in X/Z blocks, of the base (radius from the origin) */
+ /** Maximum size, in X / Z blocks, of the structure (radius from the origin) */
int m_MaxSize;
/** The underlying biome generator that defines whether the base is created or not */
diff --git a/src/Generating/VillageGen.cpp b/src/Generating/VillageGen.cpp
index f7d9a8316..a3f8caa46 100644
--- a/src/Generating/VillageGen.cpp
+++ b/src/Generating/VillageGen.cpp
@@ -162,7 +162,7 @@ protected:
/** The noise used as a pseudo-random generator */
cNoise m_Noise;
- /** Maximum size, in X/Z blocks, of the village (radius from the origin) */
+ /** Maximum size, in X / Z blocks, of the village (radius from the origin) */
int m_MaxSize;
/** The density for this village. Used to refrain from populating all house connectors. Range [0, 100] */
diff --git a/src/Generating/VillageGen.h b/src/Generating/VillageGen.h
index ed8d739df..c384ed9e5 100644
--- a/src/Generating/VillageGen.h
+++ b/src/Generating/VillageGen.h
@@ -32,7 +32,7 @@ protected:
/** Maximum depth of the generator tree*/
int m_MaxDepth;
- /** Maximum size, in X/Z blocks, of the village (radius from the origin) */
+ /** Maximum size, in X / Z blocks, of the village (radius from the origin) */
int m_MaxSize;
/** Minimum density - percentage of allowed house connections. Range [0, 100] */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 23:59:32 +0100