diff options
author | Mattes D <github@xoft.cz> | 2014-09-29 09:33:13 +0200 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2014-09-29 09:33:13 +0200 |
commit | 666aa1df94f46175589ec36b64b8e0209cde6b0b (patch) | |
tree | 6471fe8e91a5ca16a11642011a02ea3963548363 /src/Generating/StructGen.h | |
parent | Merge pull request #1478 from doublej472/master (diff) | |
parent | Fixed compilation (diff) | |
download | cuberite-666aa1df94f46175589ec36b64b8e0209cde6b0b.tar cuberite-666aa1df94f46175589ec36b64b8e0209cde6b0b.tar.gz cuberite-666aa1df94f46175589ec36b64b8e0209cde6b0b.tar.bz2 cuberite-666aa1df94f46175589ec36b64b8e0209cde6b0b.tar.lz cuberite-666aa1df94f46175589ec36b64b8e0209cde6b0b.tar.xz cuberite-666aa1df94f46175589ec36b64b8e0209cde6b0b.tar.zst cuberite-666aa1df94f46175589ec36b64b8e0209cde6b0b.zip |
Diffstat (limited to 'src/Generating/StructGen.h')
-rw-r--r-- | src/Generating/StructGen.h | 20 |
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); } ; |