From: Casimir <CasimirKaPazi@users.noreply.github.com>
Date: Sun, 4 Jun 2017 07:37:30 +0000 (+0200)
Subject: Mapgen v6: Use snow blocks in tundra and remove them from taiga (#5827)
X-Git-Tag: 5.0.0~1144
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0e58168fe5bce607f64805b854420e7558372f24;p=oweals%2Fminetest.git

Mapgen v6: Use snow blocks in tundra and remove them from taiga (#5827)

* Mapgen v6: Use snow blocks in tundra and remove them from taiga

* Use snowblocks in tundra above dirt with snow
---

diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp
index fe2b0b36f..f84f3b548 100644
--- a/src/mapgen_v6.cpp
+++ b/src/mapgen_v6.cpp
@@ -1002,14 +1002,13 @@ void MapgenV6::placeTreesAndJungleGrass()
 				continue;
 
 			v3s16 p(x, y, z);
-			// Trees grow only on mud and grass and snowblock
+			// Trees grow only on mud and grass
 			{
 				u32 i = vm->m_area.index(p);
 				content_t c = vm->m_data[i].getContent();
 				if (c != c_dirt &&
 						c != c_dirt_with_grass &&
-						c != c_dirt_with_snow &&
-						c != c_snowblock)
+						c != c_dirt_with_snow)
 					continue;
 			}
 			p.Y++;
@@ -1064,15 +1063,15 @@ void MapgenV6::growGrass() // Add surface nodes
 		content_t c = vm->m_data[i].getContent();
 		if (surface_y >= water_level - 20) {
 			if (bt == BT_TAIGA && c == c_dirt) {
-				vm->m_data[i] = n_snowblock;
-				vm->m_area.add_y(em, i, -1);
 				vm->m_data[i] = n_dirt_with_snow;
 			} else if (bt == BT_TUNDRA) {
 				if (c == c_dirt) {
+					vm->m_data[i] = n_snowblock;
+					vm->m_area.add_y(em, i, -1);
 					vm->m_data[i] = n_dirt_with_snow;
 				} else if (c == c_stone && surface_y < node_max.Y) {
 					vm->m_area.add_y(em, i, 1);
-					vm->m_data[i] = n_snow;
+					vm->m_data[i] = n_snowblock;
 				}
 			} else if (c == c_dirt) {
 				vm->m_data[i] = n_dirt_with_grass;