Engine: fix weird Slider's MaxValue increment if = MinValue

+ allow set free min and max values surpassing opposite range, clamping the range in case it becomes invalid.

Author: ivan-mogilko

Common/gui/guislider.cpp

@@ -35,6 +35,7 @@ void GUISlider::SetMinValue(int minval)
     if (_minValue != minval)
     {
         _minValue = minval;
+        _maxValue = std::max(_minValue, _maxValue);
         _value = Math::Clamp(_value, _minValue, _maxValue);
         MarkChanged();
     }
@@ -45,6 +46,7 @@ void GUISlider::SetMaxValue(int maxval)
     if (_maxValue != maxval)
     {
         _maxValue = maxval;
+        _minValue = std::min(_minValue, _maxValue);
         _value = Math::Clamp(_value, _minValue, _maxValue);
         MarkChanged();
     }
@@ -122,11 +124,6 @@ void GUISlider::UpdateMetrics()
     assert(GUI::Context.Spriteset);
     SpriteCache &spriteset = *GUI::Context.Spriteset;
 
-    // Clamp value
-    // TODO: this is necessary here because some Slider fields are still public
-    if (_minValue >= _maxValue)
-        _maxValue = _minValue + 1;
-    _value = Math::Clamp(_value, _minValue, _maxValue);
     // Test if sprite is available; // TODO: return a placeholder from spriteset instead!
     const int handle_im = ((_handleImage > 0) && spriteset.DoesSpriteExist(_handleImage)) ? _handleImage : 0;
 
@@ -329,6 +326,11 @@ void GUISlider::ReadFromFile(Stream *in, GuiVersion gui_version)
     _cachedHandle = Rect();
     _handleRange = 0;
 
+    // Clamp value range, in case the data is wrong
+    _maxValue = std::max(_minValue, _maxValue);
+    _minValue = std::min(_minValue, _maxValue);
+    _value = Math::Clamp(_value, _minValue, _maxValue);
+
     //UpdateMetrics();
     //UpdateGraphicSpace(); // can't do here, because sprite infos may not be loaded yet
 }
@@ -359,6 +361,11 @@ void GUISlider::ReadFromSavegame(Stream *in, GuiSvgVersion svg_ver)
     _cachedHandle = Rect();
     _handleRange = 0;
 
+    // Clamp value range, in case the data is wrong
+    _maxValue = std::max(_minValue, _maxValue);
+    _minValue = std::min(_minValue, _maxValue);
+    _value = Math::Clamp(_value, _minValue, _maxValue);
+
     UpdateMetrics();
     UpdateGraphicSpace();
 }

Engine/ac/slider.cpp

@@ -13,14 +13,11 @@
 //=============================================================================
 #include "ac/slider.h"
 #include "ac/common.h"
+#include "debug/debug_log.h"
 
 using namespace AGS::Common;
 
 void Slider_SetMax(GUISlider *guisl, int valn) {
-
-    if (guisl->GetMinValue() > valn)
-        quit("!Slider.Max: minimum cannot be greater than maximum");
-
     guisl->SetMaxValue(valn);
 }
 
@@ -29,9 +26,6 @@ int Slider_GetMax(GUISlider *guisl) {
 }
 
 void Slider_SetMin(GUISlider *guisl, int valn) {
-    if (valn > guisl->GetMaxValue())
-        quit("!Slider.Min: minimum cannot be greater than maximum");
-
     guisl->SetMinValue(valn);
 }