summaryrefslogtreecommitdiff
path: root/src/utility.h
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-02-06 16:35:27 +0200
committerPerttu Ahola <celeron55@gmail.com>2011-02-06 16:35:27 +0200
commit25a7fabed83caccb2c321bb4d080c5907f37b60a (patch)
treeb8aef1ef363cb1b70a1f64687cba8e58e8bc6b20 /src/utility.h
parentea2d03e4683140379b2f4f919260a9c0bbf206e3 (diff)
downloadminetest-25a7fabed83caccb2c321bb4d080c5907f37b60a.tar.gz
minetest-25a7fabed83caccb2c321bb4d080c5907f37b60a.tar.bz2
minetest-25a7fabed83caccb2c321bb4d080c5907f37b60a.zip
mapgen tweaking
Diffstat (limited to 'src/utility.h')
-rw-r--r--src/utility.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/utility.h b/src/utility.h
index ab5ecfcac..10b7af638 100644
--- a/src/utility.h
+++ b/src/utility.h
@@ -585,15 +585,6 @@ inline bool isInArea(v3s16 p, v3s16 d)
);
}
-inline s16 rangelim(s16 i, s16 min, s16 max)
-{
- if(i < min)
- return min;
- if(i > max)
- return max;
- return i;
-}
-
inline s16 rangelim(s16 i, s16 max)
{
if(i < 0)
@@ -603,6 +594,8 @@ inline s16 rangelim(s16 i, s16 max)
return i;
}
+#define rangelim(d, min, max) ((d) < (min) ? (min) : ((d)>(max)?(max):(d)))
+
inline v3s16 arealim(v3s16 p, s16 d)
{
if(p.X < 0)