bugfix(gui): Remove slider bounds checks to prevent unexpected reset of custom settings (TheSuperHackers#2624)

Author: Skyaero42

Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp

@@ -394,13 +394,14 @@ WindowMsgHandledType GadgetHorizontalSliderSystem( GameWindow *window, UnsignedI
 			Int newPos = (Int)mData1;
 			GameWindow *child = window->winGetChild();
 
-			if( newPos < s->minVal || newPos > s->maxVal )
-				break;
+			// TheSuperHackers @fix No longer reject out of bounds positions to prevent
+			// reset of custom option.ini settings to 0.
 
 			s->position = newPos;
 
 			// Translate to window coords
 			newPos = (Int)((newPos - s->minVal) * s->numTicks);
+			newPos = clamp(0, newPos, (Int)((s->maxVal - s->minVal) * s->numTicks));
 
 			child->winSetPosition( newPos , HORIZONTAL_SLIDER_THUMB_POSITION );
 			break;

Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp

@@ -378,13 +378,14 @@ WindowMsgHandledType GadgetVerticalSliderSystem( GameWindow *window, UnsignedInt
 			Int newPos = (Int)mData1;
 			GameWindow *child = window->winGetChild();
 
-			if (newPos < s->minVal || newPos > s->maxVal)
-				break;
+			// TheSuperHackers @fix No longer reject out of bounds positions to prevent
+			// reset of custom option.ini settings to 0.
 
 			s->position = newPos;
 
 			// Translate to window coords
 			newPos = (Int)((s->maxVal - newPos) * s->numTicks);
+			newPos = clamp(0, newPos, (Int)((s->maxVal - s->minVal) * s->numTicks));
 
 			child->winSetPosition( 0, newPos );
 

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp

@@ -394,13 +394,14 @@ WindowMsgHandledType GadgetHorizontalSliderSystem( GameWindow *window, UnsignedI
 			Int newPos = (Int)mData1;
 			GameWindow *child = window->winGetChild();
 
-			if( newPos < s->minVal || newPos > s->maxVal )
-				break;
+			// TheSuperHackers @fix No longer reject out of bounds positions to prevent
+			// reset of custom option.ini settings to 0.
 
 			s->position = newPos;
 
 			// Translate to window coords
 			newPos = (Int)((newPos - s->minVal) * s->numTicks);
+			newPos = clamp(0, newPos, (Int)((s->maxVal - s->minVal) * s->numTicks));
 
 			child->winSetPosition( newPos , HORIZONTAL_SLIDER_THUMB_POSITION );
 			break;

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp

@@ -378,13 +378,14 @@ WindowMsgHandledType GadgetVerticalSliderSystem( GameWindow *window, UnsignedInt
 			Int newPos = (Int)mData1;
 			GameWindow *child = window->winGetChild();
 
-			if (newPos < s->minVal || newPos > s->maxVal)
-				break;
+			// TheSuperHackers @fix No longer reject out of bounds positions to prevent
+			// reset of custom option.ini settings to 0.
 
 			s->position = newPos;
 
 			// Translate to window coords
 			newPos = (Int)((s->maxVal - newPos) * s->numTicks);
+			newPos = clamp(0, newPos, (Int)((s->maxVal - s->minVal) * s->numTicks));
 
 			child->winSetPosition( 0, newPos );