summaryrefslogtreecommitdiff
path: root/src/mapgen.cpp
diff options
context:
space:
mode:
authorkwolekr <mirrorisim@gmail.com>2013-02-23 18:06:07 -0800
committerkwolekr <mirrorisim@gmail.com>2013-02-23 18:06:07 -0800
commit9bd76f2972b1cec909d886770f063ead07efbf17 (patch)
tree5adffffa74ca406fc36ec91df30bbd9f2d45186f /src/mapgen.cpp
parent6b9906687b85fcefa28df572d92a3dea3118c0a3 (diff)
parentf0d70d4e86ddeae33939744535f0732434ad422e (diff)
downloadminetest-9bd76f2972b1cec909d886770f063ead07efbf17.tar.gz
minetest-9bd76f2972b1cec909d886770f063ead07efbf17.tar.bz2
minetest-9bd76f2972b1cec909d886770f063ead07efbf17.zip
Merge pull request #505 from RealBadAngel/master
Add seed parameter for default and L-system trees
Diffstat (limited to 'src/mapgen.cpp')
-rw-r--r--src/mapgen.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index b19073e90..a2d920bbc 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -2251,6 +2251,7 @@ void make_block(BlockMakeData *data)
*/
assert(central_area_size.X == central_area_size.Z);
{
+ PseudoRandom ps (blockseed);
// Divide area into parts
s16 div = 8;
s16 sidelen = central_area_size.X / div;
@@ -2278,8 +2279,8 @@ void make_block(BlockMakeData *data)
// Put trees in random places on part of division
for(u32 i=0; i<tree_count; i++)
{
- s16 x = myrand_range(p2d_min.X, p2d_max.X);
- s16 z = myrand_range(p2d_min.Y, p2d_max.Y);
+ s16 x = ps.range(p2d_min.X, p2d_max.X);
+ s16 z = ps.range(p2d_min.Y, p2d_max.Y);
s16 y = find_ground_level(vmanip, v2s16(x,z), ndef);
// Don't make a tree under water level
if(y < WATER_LEVEL)
@@ -2300,7 +2301,7 @@ void make_block(BlockMakeData *data)
}
p.Y++;
// Make a tree
- treegen::make_tree(vmanip, p, false, ndef);
+ treegen::make_tree(vmanip, p, false, ndef, ps.next());
}
}
}