summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Generating/ComposableGenerator.cpp14
-rw-r--r--src/Generating/StructGen.cpp2
-rw-r--r--src/Generating/StructGen.h14
3 files changed, 15 insertions, 15 deletions
diff --git a/src/Generating/ComposableGenerator.cpp b/src/Generating/ComposableGenerator.cpp
index 58ad8fc2e..2f575fe27 100644
--- a/src/Generating/ComposableGenerator.cpp
+++ b/src/Generating/ComposableGenerator.cpp
@@ -424,13 +424,13 @@ void cComposableGenerator::InitFinishGens(cIniFile & a_IniFile)
{
cStructGenOreNests::OreList Ores;
- // Quarts vein
- cStructGenOreNests::OreInfo QuartsVein;
- QuartsVein.BlockType = E_BLOCK_NETHER_QUARTZ_ORE;
- QuartsVein.MaxHeight = 255;
- QuartsVein.NumNests = 80;
- QuartsVein.NestSize = 8;
- Ores.push_back(QuartsVein);
+ // Quartz vein
+ cStructGenOreNests::OreInfo QuartzVein;
+ QuartzVein.BlockType = E_BLOCK_NETHER_QUARTZ_ORE;
+ QuartzVein.MaxHeight = 255;
+ QuartzVein.NumNests = 80;
+ QuartzVein.NestSize = 8;
+ Ores.push_back(QuartzVein);
m_FinishGens.push_back(new cStructGenOreNests(Seed, Ores, E_BLOCK_NETHERRACK));
diff --git a/src/Generating/StructGen.cpp b/src/Generating/StructGen.cpp
index 1a43f2b2e..731324b0d 100644
--- a/src/Generating/StructGen.cpp
+++ b/src/Generating/StructGen.cpp
@@ -276,7 +276,7 @@ void cStructGenOreNests::GenFinish(cChunkDesc & a_ChunkDesc)
int seq = 1;
// Generate the ores from the ore list.
- for (OreList::iterator itr = m_OreList.begin(); itr != m_OreList.end(); ++itr)
+ for (OreList::const_iterator itr = m_OreList.begin(); itr != m_OreList.end(); ++itr)
{
GenerateOre(ChunkX, ChunkZ, itr->BlockType, itr->MaxHeight, itr->NumNests, itr->NestSize, BlockTypes, seq);
seq++;
diff --git a/src/Generating/StructGen.h b/src/Generating/StructGen.h
index e2fe8bc1a..55d5bc1c7 100644
--- a/src/Generating/StructGen.h
+++ b/src/Generating/StructGen.h
@@ -78,16 +78,16 @@ class cStructGenOreNests :
public:
struct OreInfo
{
- BLOCKTYPE BlockType; // The type of the nest.
- int MaxHeight; // The highest possible a nest can occur
- int NumNests; // How many nests per chunk
- int NestSize; // The amount of blocks a nest can have.
+ BLOCKTYPE BlockType; // The type of the nest.
+ int MaxHeight; // The highest possible a nest can occur
+ int NumNests; // How many nests per chunk
+ int NestSize; // The amount of blocks a nest can have.
};
typedef std::vector<OreInfo> OreList;
- cStructGenOreNests(int a_Seed, OreList a_OreList, BLOCKTYPE a_ToReplace) :
- m_Noise(a_Seed),
+ cStructGenOreNests(int a_Seed, OreList a_OreList, BLOCKTYPE a_ToReplace) :
+ m_Noise(a_Seed),
m_Seed(a_Seed),
m_OreList(a_OreList),
m_ToReplace(a_ToReplace)
@@ -97,7 +97,7 @@ protected:
cNoise m_Noise;
int m_Seed;
- OreList m_OreList; // A list of possible ores.
+ OreList m_OreList; // A list of possible ores.
BLOCKTYPE m_ToReplace;
// cFinishGen override: