From 9b0d77a549e4c29c9c189ff2a454568fa9746c1e Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Tue, 30 Dec 2014 01:48:20 -0500
Subject: Replace instances of height_min/height_max with y_min/y_max to remove
 ambiguity

---
 src/mg_decoration.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mg_decoration.cpp')

diff --git a/src/mg_decoration.cpp b/src/mg_decoration.cpp
index dec82a638..1848024dc 100644
--- a/src/mg_decoration.cpp
+++ b/src/mg_decoration.cpp
@@ -140,8 +140,8 @@ size_t Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
 					mg->heightmap[mapindex] :
 					mg->findGroundLevel(v2s16(x, z), nmin.Y, nmax.Y);
 
-			if (y < nmin.Y     || y > nmax.Y ||
-				y < height_min || y > height_max)
+			if (y < nmin.Y || y > nmax.Y ||
+				y < y_min  || y > y_max)
 				continue;
 
 			int height = getHeight();
-- 
cgit v1.2.3