summaryrefslogtreecommitdiffstats
path: root/src/Generating/StructGen.h
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-09-29 14:37:01 +0200
committerHowaner <franzi.moos@googlemail.com>2014-09-29 14:37:01 +0200
commit347402d20d7ecaab3daad691eb178c5a04447d44 (patch)
tree4a3188eef6087a3029b348cbbe8c93e5d365d158 /src/Generating/StructGen.h
parentFixed SetDefaultRank() return value. (diff)
parentMerge pull request #1479 from SphinxC0re/master (diff)
downloadcuberite-347402d20d7ecaab3daad691eb178c5a04447d44.tar
cuberite-347402d20d7ecaab3daad691eb178c5a04447d44.tar.gz
cuberite-347402d20d7ecaab3daad691eb178c5a04447d44.tar.bz2
cuberite-347402d20d7ecaab3daad691eb178c5a04447d44.tar.lz
cuberite-347402d20d7ecaab3daad691eb178c5a04447d44.tar.xz
cuberite-347402d20d7ecaab3daad691eb178c5a04447d44.tar.zst
cuberite-347402d20d7ecaab3daad691eb178c5a04447d44.zip
Diffstat (limited to '')
-rw-r--r--src/Generating/StructGen.h20
1 files changed, 15 insertions, 5 deletions
diff --git a/src/Generating/StructGen.h b/src/Generating/StructGen.h
index 55d5bc1c7..96aa3e437 100644
--- a/src/Generating/StructGen.h
+++ b/src/Generating/StructGen.h
@@ -78,10 +78,20 @@ 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.
+ NIBBLETYPE BlockMeta; // The block meta
+ 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.
+
+ OreInfo() :
+ BlockType(0),
+ BlockMeta(0),
+ MaxHeight(0),
+ NumNests(0),
+ NestSize(0)
+ {
+ }
};
typedef std::vector<OreInfo> OreList;
@@ -103,7 +113,7 @@ protected:
// cFinishGen override:
virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
- void GenerateOre(int a_ChunkX, int a_ChunkZ, BLOCKTYPE a_OreType, int a_MaxHeight, int a_NumNests, int a_NestSize, cChunkDef::BlockTypes & a_BlockTypes, int a_Seq);
+ void GenerateOre(int a_ChunkX, int a_ChunkZ, BLOCKTYPE a_OreType, NIBBLETYPE a_BlockMeta, int a_MaxHeight, int a_NumNests, int a_NestSize, cChunkDef::BlockTypes & a_BlockTypes, cChunkDesc::BlockNibbleBytes & a_BlockMetas, int a_Seq);
} ;