Skip to content
Permalink
Browse files

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

  • Loading branch information
red-001 committed Nov 12, 2020
1 parent 68139a2 commit 8eb2cbac613c92c1a7656ecb542e63fed9023061
Showing with 6 additions and 3 deletions.
  1. +1 −1 src/gui/guiScrollBar.cpp
  2. +0 −1 src/gui/guiScrollBar.h
  3. +5 −1 src/mapgen/mg_ore.cpp
@@ -21,7 +21,7 @@ GUIScrollBar::GUIScrollBar(IGUIEnvironment *environment, IGUIElement *parent, s3
is_horizontal(horizontal), is_auto_scaling(auto_scale),
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),
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();
setNotClipped(false);
@@ -68,7 +68,6 @@ class GUIScrollBar : public IGUIElement
s32 max_pos;
s32 small_step;
s32 large_step;
u32 last_change;
s32 drag_offset;
s32 page_size;
s32 border_size;
@@ -498,7 +498,11 @@ void OreVein::generate(MMVManip *vm, int mapseed, u32 blockseed,
}

// 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 noiseval2 = contour(noise2->result[index]);
if (noiseval * noiseval2 + randval * random_factor < nthresh)

0 comments on commit 8eb2cba

Please sign in to comment.
You can’t perform that action at this time.