diff options
| author | kwolekr <kwolekr@minetest.net> | 2014-11-14 02:58:56 -0500 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2014-11-14 03:07:12 -0500 |
| commit | 8d3a68f343777c438b9caf9f646e913d4b66e046 (patch) | |
| tree | c69c8b6d0fd2570451f7d56e72faa75d06130638 /src/mapgen_v6.cpp | |
| parent | 5b8855e83c0d1cc7aef21492e7fe862b7d06917e (diff) | |
| download | minetest-8d3a68f343777c438b9caf9f646e913d4b66e046.tar.gz minetest-8d3a68f343777c438b9caf9f646e913d4b66e046.tar.bz2 minetest-8d3a68f343777c438b9caf9f646e913d4b66e046.zip | |
Fix warnings and other misc. minor changes
Diffstat (limited to 'src/mapgen_v6.cpp')
| -rw-r--r-- | src/mapgen_v6.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp index 30d512783..de0c81688 100644 --- a/src/mapgen_v6.cpp +++ b/src/mapgen_v6.cpp @@ -312,7 +312,7 @@ bool MapgenV6::getHaveBeach(v2s16 p) { } -BiomeType MapgenV6::getBiome(v2s16 p) { +BiomeV6Type MapgenV6::getBiome(v2s16 p) { int index = (p.Y - node_min.Z) * ystride + (p.X - node_min.X); return getBiome(index, p); } @@ -387,7 +387,7 @@ bool MapgenV6::getHaveBeach(int index) } -BiomeType MapgenV6::getBiome(int index, v2s16 p) +BiomeV6Type MapgenV6::getBiome(int index, v2s16 p) { // Just do something very simple as for now /*double d = noise2d_perlin( @@ -608,7 +608,7 @@ int MapgenV6::generateGround() { if (surface_y > stone_surface_max_y) stone_surface_max_y = surface_y; - BiomeType bt = getBiome(index, v2s16(x, z)); + BiomeV6Type bt = getBiome(index, v2s16(x, z)); // Fill ground with stone v3s16 em = vm->m_area.getExtent(); @@ -652,7 +652,7 @@ void MapgenV6::addMud() { if (surface_y == vm->m_area.MinEdge.Y - 1) continue; - BiomeType bt = getBiome(index, v2s16(x, z)); + BiomeV6Type bt = getBiome(index, v2s16(x, z)); addnode = (bt == BT_DESERT) ? n_desert_sand : n_dirt; if (bt == BT_DESERT && surface_y + mud_add_amount <= water_level + 1) { |