summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSTRWarrior <niels.breuker@hotmail.nl>2014-08-02 21:44:16 +0200
committerSTRWarrior <niels.breuker@hotmail.nl>2014-08-02 21:44:16 +0200
commita44fbf2338e98e81bbc55780c92fa8780b061f9f (patch)
treec7a85ca1a706568d4ec12b72e350171364e1aab4
parentMerge pull request #1275 from Howaner/BlockEntitys (diff)
downloadcuberite-a44fbf2338e98e81bbc55780c92fa8780b061f9f.tar
cuberite-a44fbf2338e98e81bbc55780c92fa8780b061f9f.tar.gz
cuberite-a44fbf2338e98e81bbc55780c92fa8780b061f9f.tar.bz2
cuberite-a44fbf2338e98e81bbc55780c92fa8780b061f9f.tar.lz
cuberite-a44fbf2338e98e81bbc55780c92fa8780b061f9f.tar.xz
cuberite-a44fbf2338e98e81bbc55780c92fa8780b061f9f.tar.zst
cuberite-a44fbf2338e98e81bbc55780c92fa8780b061f9f.zip
Diffstat (limited to '')
-rw-r--r--src/Generating/HeiGen.cpp2
-rw-r--r--src/Generating/Trees.cpp2
-rw-r--r--src/Generating/Trees.h2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/Generating/HeiGen.cpp b/src/Generating/HeiGen.cpp
index 870ceef7f..ba11b31b4 100644
--- a/src/Generating/HeiGen.cpp
+++ b/src/Generating/HeiGen.cpp
@@ -432,7 +432,7 @@ const cHeiGenBiomal::sGenParam cHeiGenBiomal::m_GenParam[256] =
/* biExtremeHillsM */ { 0.1f, 2.0f, 0.05f, 12.0f, 0.01f, 10.0f, 40}, // 131
/* biFlowerForest */ { 0.1f, 2.0f, 0.05f, 12.0f, 0.01f, 10.0f, 40}, // 132
/* biTaigaM */ { 0.1f, 2.0f, 0.05f, 12.0f, 0.01f, 10.0f, 40}, // 133
- /* biSwamplandM */ { 0.1f, 2.0f, 0.05f, 12.0f, 0.01f, 10.0f, 40}, // 134
+ /* biSwamplandM */ { 1.0f, 2.0f, 1.10f, 5.0f, 0.01f, 8.0f, 60}, // 134
// Biomes 135 .. 139 unused, 5 empty placeholders here:
{}, {}, {}, {}, {}, // 135 .. 139
diff --git a/src/Generating/Trees.cpp b/src/Generating/Trees.cpp
index 32594d0b4..1b0f2dc14 100644
--- a/src/Generating/Trees.cpp
+++ b/src/Generating/Trees.cpp
@@ -181,6 +181,7 @@ void GetTreeImageByBiome(int a_BlockX, int a_BlockY, int a_BlockZ, cNoise & a_No
return;
}
+ case biSwamplandM:
case biSwampland:
{
// Swamp trees:
@@ -233,7 +234,6 @@ void GetTreeImageByBiome(int a_BlockX, int a_BlockY, int a_BlockZ, cNoise & a_No
case biExtremeHillsM:
case biFlowerForest:
case biTaigaM:
- case biSwamplandM:
case biIcePlainsSpikes:
case biJungleM:
case biJungleEdgeM:
diff --git a/src/Generating/Trees.h b/src/Generating/Trees.h
index 1f6ac4dff..c9eb7de80 100644
--- a/src/Generating/Trees.h
+++ b/src/Generating/Trees.h
@@ -28,6 +28,7 @@ logs can overwrite others(leaves), but others shouldn't overwrite logs. This is
#define CASE_TREE_ALLOWED_BLOCKS \
case E_BLOCK_AIR: \
case E_BLOCK_LEAVES: \
+ case E_BLOCK_NEW_LEAVES: \
case E_BLOCK_SNOW: \
case E_BLOCK_TALL_GRASS: \
case E_BLOCK_DEAD_BUSH: \
@@ -40,6 +41,7 @@ logs can overwrite others(leaves), but others shouldn't overwrite logs. This is
/* case E_BLOCK_LEAVES: LEAVES are a special case, they can be overwritten only by log. Handled in cChunkMap::ReplaceTreeBlocks(). */ \
case E_BLOCK_SNOW: \
case E_BLOCK_TALL_GRASS: \
+ case E_BLOCK_BIG_FLOWER: \
case E_BLOCK_DEAD_BUSH: \
case E_BLOCK_SAPLING: \
case E_BLOCK_VINES