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

Added proper trees and height for SwamplandM biome

Browse Source
This commit is contained in:
STRWarrior 2014-08-02 21:44:16 +02:00
parent 543b0ccf75
commit a44fbf2338
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Generating/HeiGen.cpp
View File

@ -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 /* 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 /* 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 /* 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: // Biomes 135 .. 139 unused, 5 empty placeholders here:
{}, {}, {}, {}, {}, // 135 .. 139 {}, {}, {}, {}, {}, // 135 .. 139

2
src/Generating/Trees.cpp
View File

@ -181,6 +181,7 @@ void GetTreeImageByBiome(int a_BlockX, int a_BlockY, int a_BlockZ, cNoise & a_No
return; return;
} }
case biSwamplandM:
case biSwampland: case biSwampland:
{ {
// Swamp trees: // Swamp trees:
@ -233,7 +234,6 @@ void GetTreeImageByBiome(int a_BlockX, int a_BlockY, int a_BlockZ, cNoise & a_No
case biExtremeHillsM: case biExtremeHillsM:
case biFlowerForest: case biFlowerForest:
case biTaigaM: case biTaigaM:
case biSwamplandM:
case biIcePlainsSpikes: case biIcePlainsSpikes:
case biJungleM: case biJungleM:
case biJungleEdgeM: case biJungleEdgeM:

2
src/Generating/Trees.h
View File

@ -28,6 +28,7 @@ logs can overwrite others(leaves), but others shouldn't overwrite logs. This is
#define CASE_TREE_ALLOWED_BLOCKS \ #define CASE_TREE_ALLOWED_BLOCKS \
case E_BLOCK_AIR: \ case E_BLOCK_AIR: \
case E_BLOCK_LEAVES: \ case E_BLOCK_LEAVES: \
case E_BLOCK_NEW_LEAVES: \
case E_BLOCK_SNOW: \ case E_BLOCK_SNOW: \
case E_BLOCK_TALL_GRASS: \ case E_BLOCK_TALL_GRASS: \
case E_BLOCK_DEAD_BUSH: \ 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_LEAVES: LEAVES are a special case, they can be overwritten only by log. Handled in cChunkMap::ReplaceTreeBlocks(). */ \
case E_BLOCK_SNOW: \ case E_BLOCK_SNOW: \
case E_BLOCK_TALL_GRASS: \ case E_BLOCK_TALL_GRASS: \
case E_BLOCK_BIG_FLOWER: \
case E_BLOCK_DEAD_BUSH: \ case E_BLOCK_DEAD_BUSH: \
case E_BLOCK_SAPLING: \ case E_BLOCK_SAPLING: \
case E_BLOCK_VINES case E_BLOCK_VINES