summaryrefslogtreecommitdiff
path: root/src/map.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-02-08 10:11:26 +0200
committerPerttu Ahola <celeron55@gmail.com>2011-02-08 10:11:26 +0200
commit15f27a19378345c22b07e37ab324581d55ad9c5b (patch)
tree304d8b0568ca6503dcde795fedaf6ad193cc48a8 /src/map.cpp
parentdd9e82f5bc2982abab436afdd68df799c6fdd857 (diff)
downloadminetest-15f27a19378345c22b07e37ab324581d55ad9c5b.tar.gz
minetest-15f27a19378345c22b07e37ab324581d55ad9c5b.tar.bz2
minetest-15f27a19378345c22b07e37ab324581d55ad9c5b.zip
made it to work with my windows compiler
Diffstat (limited to 'src/map.cpp')
-rw-r--r--src/map.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map.cpp b/src/map.cpp
index b51f1dac2..696019f3a 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -2009,9 +2009,10 @@ double tree_amount_2d(u64 seed, v2s16 p)
double base_rock_level_2d(u64 seed, v2s16 p)
{
// The base ground level
- double base = WATER_LEVEL - 4.0 + 25. * noise2d_perlin(
+ double base = (double)WATER_LEVEL - 4.0 + 25. * noise2d_perlin(
0.5+(float)p.X/250., 0.5+(float)p.Y/250.,
(seed>>32)+654879876, 6, 0.6);
+
/*// A bit hillier one
double base2 = WATER_LEVEL - 4.0 + 40. * noise2d_perlin(
0.5+(float)p.X/250., 0.5+(float)p.Y/250.,
@@ -2020,7 +2021,7 @@ double base_rock_level_2d(u64 seed, v2s16 p)
base = base2;*/
#if 1
// Higher ground level
- double higher = WATER_LEVEL + 13. + 50. * noise2d_perlin(
+ double higher = (double)WATER_LEVEL + 13. + 50. * noise2d_perlin(
0.5+(float)p.X/500., 0.5+(float)p.Y/500.,
seed+85039, 6, 0.69);
//higher = 30; // For debugging
@@ -2046,7 +2047,7 @@ double base_rock_level_2d(u64 seed, v2s16 p)
/*double a = 0.5 + b * (a_off + noise2d_perlin(
0.5+(float)p.X/500., 0.5+(float)p.Y/500.,
seed-359, 6, 0.7));*/
- double a = 0.5 + b * (a_off + noise2d_perlin(
+ double a = (double)0.5 + b * (a_off + noise2d_perlin(
0.5+(float)p.X/250., 0.5+(float)p.Y/250.,
seed-359, 5, 0.60));
// Limit