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

diff --git a/src/gui/guiScrollBar.cpp b/src/gui/guiScrollBar.cpp
index b04ccb9d50496361e3ff02ef44738da56d774404..c6a03f3e495354b16d021d28ac784fbcb3b40baa 100644 (file)
--- a/src/gui/guiScrollBar.cpp
+++ b/src/gui/guiScrollBar.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);

diff --git a/src/gui/guiScrollBar.h b/src/gui/guiScrollBar.h
index 29493bb993220f8d8d23c9c6c94240f24daf3ae4..d18f8e8753ec8d81f98dda49645447b10e697557 100644 (file)
--- a/src/gui/guiScrollBar.h
+++ b/src/gui/guiScrollBar.h
@@ -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;

diff --git a/src/mapgen/mg_ore.cpp b/src/mapgen/mg_ore.cpp
index b50ed6a32f2a46713ce40c7c03176dcc3dbbecb4..5814f433a81182b7214aeb15f6637f36b4d0b5a2 100644 (file)
--- a/src/mapgen/mg_ore.cpp
+++ b/src/mapgen/mg_ore.cpp
@@ -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)