aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorparamat <mat.gregory@virginmedia.com>2016-07-10 16:03:53 +0100
committerparamat <mat.gregory@virginmedia.com>2016-07-12 20:22:26 +0100
commit91f68e7d11e89dbc73ec259eb057de51099dfe8c (patch)
tree402aeaef049ed33ce86e159a35a52b3791c6b713 /src
parent7eeb735cab749958fdad996d4804942155806ab6 (diff)
downloadminetest-91f68e7d11e89dbc73ec259eb057de51099dfe8c.tar.gz
minetest-91f68e7d11e89dbc73ec259eb057de51099dfe8c.tar.bz2
minetest-91f68e7d11e89dbc73ec259eb057de51099dfe8c.zip
Treegen: Improve use of signed vs. unsigned integers
To fix GCC 6.1.1 compilation warning: 'assuming signed overflow does not occur when assuming that (X - c) > X is always false'
Diffstat (limited to 'src')
-rw-r--r--src/treegen.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/treegen.cpp b/src/treegen.cpp
index 36d387c57..f37bf0e86 100644
--- a/src/treegen.cpp
+++ b/src/treegen.cpp
@@ -770,9 +770,9 @@ void make_pine_tree(MMVManip &vmanip, v3s16 p0, INodeDefManager *ndef, s32 seed)
MapNode snownode(c_snow);
PseudoRandom pr(seed);
- s16 trunk_h = pr.range(9, 13);
+ u16 trunk_h = pr.range(9, 13);
v3s16 p1 = p0;
- for (s16 ii = 0; ii < trunk_h; ii++) {
+ for (u16 ii = 0; ii < trunk_h; ii++) {
if (vmanip.m_area.contains(p1)) {
u32 vi = vmanip.m_area.index(p1);
vmanip.m_data[vi] = treenode;
@@ -790,7 +790,7 @@ void make_pine_tree(MMVManip &vmanip, v3s16 p0, INodeDefManager *ndef, s32 seed)
leaves_d[i] = 0;
// Upper branches
- s16 dev = 3;
+ u16 dev = 3;
for (s16 yy = -1; yy <= 1; yy++) {
for (s16 zz = -dev; zz <= dev; zz++) {
u32 i = leaves_a.index(v3s16(-dev, yy, zz));