flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Bunch of tweaks: 

Renamed Quarts to Quartz
Using const_iterator instead of iterator
Used CheckBasicStyle script to find style errors
This commit is contained in:
STRWarrior 2014-08-10 22:36:02 +02:00
parent e529401dbb
commit d95768d01a
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Generating/ComposableGenerator.cpp
View File

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

2
src/Generating/StructGen.cpp
View File

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

14
src/Generating/StructGen.h
View File

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