diff options
author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-14 22:43:22 +0200 |
---|---|---|
committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-14 22:43:28 +0200 |
commit | 3560f0de082a8950a84e2e866981f8bdfd05428a (patch) | |
tree | dfb765f7e590189f05e7807c80be72e6ecf8cc4d /src/noise.h | |
parent | 5146c826be9386cc2adeb8f678063a2f9cfc1dee (diff) | |
parent | 81535f6277b66c869cda7125b2aeaf99e8078b92 (diff) | |
download | hax-minetest-server-3560f0de082a8950a84e2e866981f8bdfd05428a.tar.gz hax-minetest-server-3560f0de082a8950a84e2e866981f8bdfd05428a.zip |
Merge branch 'upstream/master'
Conflicts:
data/oerkki1.png
src/client.cpp
Diffstat (limited to 'src/noise.h')
-rw-r--r-- | src/noise.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/noise.h b/src/noise.h index c8d8985c6..ed75f316d 100644 --- a/src/noise.h +++ b/src/noise.h @@ -82,10 +82,11 @@ double noise3d_perlin_abs(double x, double y, double z, int seed, enum NoiseType { + NOISE_CONSTANT_ONE, NOISE_PERLIN, NOISE_PERLIN_ABS, NOISE_PERLIN_CONTOUR, - NOISE_PERLIN_CONTOUR_FLIP_YZ + NOISE_PERLIN_CONTOUR_FLIP_YZ, }; struct NoiseParams |