Review changes and changelog entry

Also removed three lines from MetagameGUI.cpp, to be done as part of the MetagameGUI.ini in the data repo.
Data pr coming soon(tm).

Author: orengg

CHANGELOG.md

@@ -135,6 +135,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Game window resolution can now be changed without restarting the game.
 
+- GUI sliders (like for music volume) can now be adjusted with the mouse scroll wheel.
+
 ### Changed
 
 - Codebase now uses the C++17 standard.

GUI/GUISlider.cpp

@@ -118,12 +118,11 @@ void GUISlider::Create(GUIProperties *Props)
     Props->GetValue("Minimum", &m_Minimum);
     Props->GetValue("Maximum", &m_Maximum);
     Props->GetValue("Value", &m_Value);
-	const bool gotValueRes = Props->GetValue("ValueResolution", &m_ValueResolution);
-	if (!gotValueRes) {
+	if (!Props->GetValue("ValueResolution", &m_ValueResolution)) {
 		m_ValueResolution = std::max((m_Maximum - m_Minimum) / 100, 1);
 	}
 
-    m_Value = std::clamp(m_Value, m_Minimum,m_Maximum);
+	m_Value = std::clamp(m_Value, m_Minimum, m_Maximum);
 
     // Re-Calculate the knob info
     CalculateKnob();
@@ -524,15 +523,16 @@ GUIPanel *GUISlider::GetPanel(void)
 // Description:     Calculates the knob position and size.
 
 void GUISlider::CalculateKnob(void) {
-	if (!m_KnobImage)
+	if (!m_KnobImage) {
 		return;
+	}
 
 	if (m_Maximum > m_Minimum) {
-		const bool orientation = (m_Orientation == Horizontal);
-		m_KnobSize = (orientation) ? m_KnobImage->GetWidth() : m_KnobImage->GetHeight();
-		const int size = (orientation) ? m_Width : m_Height;
+		const bool horizontalOrientation = (m_Orientation == Horizontal);
+		m_KnobSize = (horizontalOrientation) ? m_KnobImage->GetWidth() : m_KnobImage->GetHeight();
+		const int size = (horizontalOrientation) ? m_Width : m_Height;
 		const float valueRatio = static_cast<float>(m_Value - m_Minimum) / static_cast<float>(m_Maximum - m_Minimum);
-		m_KnobPosition = m_EndThickness + static_cast<int>(static_cast<float>(size - m_KnobSize - 2 * m_EndThickness) * valueRatio);
+		m_KnobPosition = m_EndThickness + static_cast<int>(static_cast<float>(size - m_KnobSize - (m_EndThickness * 2)) * valueRatio);
 	}
 }
 

Menus/MetagameGUI.cpp

@@ -546,9 +546,6 @@ int MetagameGUI::Create(Controller *pController)
     m_pGoldSlider = dynamic_cast<GUISlider *>(m_pGUIController->GetControl("GoldSlider"));
     m_pLengthLabel = dynamic_cast<GUILabel *>(m_pGUIController->GetControl("LengthLabel"));
     m_pLengthSlider = dynamic_cast<GUISlider *>(m_pGUIController->GetControl("LengthSlider"));
-	m_pLengthSlider->SetMinimum(1);
-	m_pLengthSlider->SetMaximum(20);
-	m_pLengthSlider->SetValue(10);
     m_pErrorLabel = dynamic_cast<GUILabel *>(m_pGUIController->GetControl("StartErrorLabel"));
     m_apPlayerControlButton[Players::PlayerOne] = dynamic_cast<GUIButton *>(m_pGUIController->GetControl("P1ControlButton"));
     m_apPlayerControlButton[Players::PlayerTwo] = dynamic_cast<GUIButton *>(m_pGUIController->GetControl("P2ControlButton"));