BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Treegen: Fix s16 overflow warning (#6082)

Browse Source
This commit is contained in:
Vincent Glize 2017-07-04 22:18:28 +01:00 committed by SmallJoker
parent 66c4108581
commit 61a3de42fd
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/treegen.cpp
View File

@ -802,12 +802,9 @@ void make_pine_tree(MMVManip &vmanip, v3s16 p0, INodeDefManager *ndef, s32 seed)
} }
// Centre top nodes // Centre top nodes
u32 i = leaves_a.index(v3s16(0, 1, 0)); leaves_d[leaves_a.index(v3s16(0, 1, 0))] = 1;
leaves_d[i] = 1; leaves_d[leaves_a.index(v3s16(0, 2, 0))] = 1;
i = leaves_a.index(v3s16(0, 2, 0)); leaves_d[leaves_a.index(v3s16(0, 3, 0))] = 2;
leaves_d[i] = 1;
i = leaves_a.index(v3s16(0, 3, 0));
leaves_d[i] = 2;
// Lower branches // Lower branches
s16 my = -6; s16 my = -6;
@ -820,7 +817,7 @@ void make_pine_tree(MMVManip &vmanip, v3s16 p0, INodeDefManager *ndef, s32 seed)
for (s16 zz = zi; zz <= zi + 1; zz++) { for (s16 zz = zi; zz <= zi + 1; zz++) {
u32 i = leaves_a.index(v3s16(xi, yy, zz)); u32 i = leaves_a.index(v3s16(xi, yy, zz));
u32 ia = leaves_a.index(v3s16(xi, yy + 1, zz)); u32 ia = leaves_a.index(v3s16(xi, yy + 1, zz));
for (s16 xx = xi; xx <= xi + 1; xx++) { for (s32 xx = xi; xx <= xi + 1; xx++) {
leaves_d[i] = 1; leaves_d[i] = 1;
if (leaves_d[ia] == 0) if (leaves_d[ia] == 0)
leaves_d[ia] = 2; leaves_d[ia] = 2;