summaryrefslogtreecommitdiff
path: root/src/mapgen_v6.h
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2014-11-14 02:58:56 -0500
committerkwolekr <kwolekr@minetest.net>2014-11-14 03:07:12 -0500
commit8d3a68f343777c438b9caf9f646e913d4b66e046 (patch)
treec69c8b6d0fd2570451f7d56e72faa75d06130638 /src/mapgen_v6.h
parent5b8855e83c0d1cc7aef21492e7fe862b7d06917e (diff)
downloadminetest-8d3a68f343777c438b9caf9f646e913d4b66e046.tar.gz
minetest-8d3a68f343777c438b9caf9f646e913d4b66e046.tar.bz2
minetest-8d3a68f343777c438b9caf9f646e913d4b66e046.zip
Fix warnings and other misc. minor changes
Diffstat (limited to 'src/mapgen_v6.h')
-rw-r--r--src/mapgen_v6.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h
index 1fac37fb6..eecfb1fe6 100644
--- a/src/mapgen_v6.h
+++ b/src/mapgen_v6.h
@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
extern FlagDesc flagdesc_mapgen_v6[];
-enum BiomeType
+enum BiomeV6Type
{
BT_NORMAL,
BT_DESERT
@@ -132,8 +132,8 @@ public:
virtual float getMudAmount(int index);
bool getHaveBeach(v2s16 p);
bool getHaveBeach(int index);
- BiomeType getBiome(v2s16 p);
- BiomeType getBiome(int index, v2s16 p);
+ BiomeV6Type getBiome(v2s16 p);
+ BiomeV6Type getBiome(int index, v2s16 p);
u32 get_blockseed(u64 seed, v3s16 p);