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

Fix warnings about an unused variables and implicit conversion (#10586)

Browse Source
This commit is contained in:
red-001 2020-11-12 20:05:47 +00:00 committed by GitHub
parent 68139a28eb
commit 8eb2cbac61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/guiScrollBar.cpp
View File

@ -21,7 +21,7 @@ GUIScrollBar::GUIScrollBar(IGUIEnvironment *environment, IGUIElement *parent, s3
is_horizontal(horizontal), is_auto_scaling(auto_scale), is_horizontal(horizontal), is_auto_scaling(auto_scale),
dragged_by_slider(false), tray_clicked(false), scroll_pos(0), dragged_by_slider(false), tray_clicked(false), scroll_pos(0),
draw_center(0), thumb_size(0), min_pos(0), max_pos(100), small_step(10), draw_center(0), thumb_size(0), min_pos(0), max_pos(100), small_step(10),
large_step(50), last_change(0), drag_offset(0), page_size(100), border_size(0) large_step(50), drag_offset(0), page_size(100), border_size(0)
{ {
refreshControls(); refreshControls();
setNotClipped(false); setNotClipped(false);

1
src/gui/guiScrollBar.h
View File

@ -68,7 +68,6 @@ private:
s32 max_pos; s32 max_pos;
s32 small_step; s32 small_step;
s32 large_step; s32 large_step;
u32 last_change;
s32 drag_offset; s32 drag_offset;
s32 page_size; s32 page_size;
s32 border_size; s32 border_size;

6
src/mapgen/mg_ore.cpp
View File

@ -498,7 +498,11 @@ void OreVein::generate(MMVManip *vm, int mapseed, u32 blockseed,
} }
// randval ranges from -1..1 // randval ranges from -1..1
float randval = (float)pr.next() / (pr.RANDOM_RANGE / 2) - 1.f; /*
Note: can generate values slightly larger than 1
but this can't be changed as mapgen must be deterministic accross versions.
*/
float randval = (float)pr.next() / float(pr.RANDOM_RANGE / 2) - 1.f;
float noiseval = contour(noise->result[index]); float noiseval = contour(noise->result[index]);
float noiseval2 = contour(noise2->result[index]); float noiseval2 = contour(noise2->result[index]);
if (noiseval * noiseval2 + randval * random_factor < nthresh) if (noiseval * noiseval2 + randval * random_factor < nthresh)